Hands-on Git Tasks - Part #5 of 5 | Merging

This post is part of a 5-post series on using Git.

Hands-on Git Tasks - Part #1 of 5 | First Git Commit

Hands-on Git Taks - Part #2 of 5 | Checking Git Objects

Hands-on Git Tasks - Part #3 of 5 | Navigating Project Branches

Hands-on Git Tasks - Part #4 of 5 | Using Remote Repository

Hands-On Git Tasks - Part #5 of 5 | Merging

Follow these steps for an example of how to merge code from a 'feature' branch into the 'main' branch. Did glance over branching in an earlier tutorial, but did not cover the merging of branches.

01. Go to the local-repo folder

02. check branches: git branch

03. create a new branch: git branch feature

04. check branches again: git branch

05. checkout the feature branch

06. create, add and commit a new file in 'switching' branch: switching.txt

ls echo "circuit, packet, message" > switching.txt git add switching.txt git commit -m "Added switching feature" ls

07. get-back to the 'main' branch: git checkout main

08. create, add, and commit a new file in the 'main' branch: routing.txt

ls echo "static, default, dynamic" > routing.txt git add routing.txt git commit -m "Added routing to main" ls

09. merge 'feature' into 'main' branch.

ls git merge feature ls git log

10. delete 'feature' branch

git branch git branch -d feature git branch

11. Validate that you have all the files you want in main.

If you want to find me, you can catch me, Lewis Lampkin, III at LinkedIn: https://www.linkedin.com/in/lewislampkin

If you want to read my blog: https://www.lewislampkin.com

Comments

Post a Comment

Popular posts from this blog

Orphaned No More: Adopting AWS Lambda

Image
Background HumanGov is a Model Automated Multi-Tenant Architecture (MAMA) that is meant to be used by the 50 states for personnel tracking. Currently the architecture is fully automated on AWS. The architecture is not ready for go-live. All actions so far are for a proof-of-concept that is presented to the Chief Technical Officer (CTO) for review. During the weekly team meeting, Ko (User Experience Lead) reports that his team has performed thousands of tests against the infrastructure, with moves, adds, and changes, and is not finding any issues in the application user interface. Woo (Infrastructure Lead) reports that there are hundreds of 'orphaned' files in the S3 bucket. (These files are considered 'orphaned' because they do not have corresponding records in the DynamoDB table.) Kim (Tech Lead) reports that there is not a trigger to delete the file from the bucket when a user is deleted from the DynamoDB database. Brady (Lawyer) reports that not deleting t...
Read more

Containing the Chaos! | A Three-Part Series Demonstrating the Usefulness of Containerization to HumanGov

Background HumanGov is a Model Automated Multi-Tenant Architecture (MAMA) that is meant to be used by the 50 states for personnel tracking. Currently the architecture requires Amazon Elastic Compute Cloud (EC2) instances that are maintained by the HumanGov systems administrators. The systems administrators handle all the patching, operations, etc. Due to states wanting their data separate from each other, each state gets a separate set of EC2 instances, which means that as the application scales from one state up to 50 states, the systems administrators will have to patch 50x as many EC2 instances. The system administrators report that they have begun to schedule more and more overtime to handle the maintenance windows for updating the EC2 instances. The lead developer remarked that it was taking longer and longer for new application deployments to get rolled out as the infrastructure grew and more states came on board. By the way, the development environment does not have standa...
Read more

Ansible is the Answer! | A Three-Part Series Demonstrating the Usefulness of Ansible to HumanGov

This is a three (3) part series that demonstrates how Ansible can be useful/leveraged for configuring your infrastructure. The background story here is that HumanGov is a multi-tenant cloud application that requires that each of the fifty (50) states has its own separate infrastructure. The HumanGov Infrastructure Engineers are trying to figure out how they can get it done, and they are considering using Ansible to help them deploy the application. Part 1 sets up the base infrastructure for the scenario. The HumanGov Infrastructure Engineers are accustomed to using Terraform to efficiently deploy infrastructure, but they are not very experienced with Ansible. Part 1 of 3: HumanGov: Ansible is the Answer! | Terraform | AWS Cloud9 | AWS IAM | AWS EC2 | AWS DynamoDB | AWS S3 Part 2 attempts to setup HumanGov via a MANUAL process. Part 2 goes through the steps to MANUALLY install Python, Nginx AND application files as well as MANUALLY configuring the firewall in Ubuntu. After g...
Read more