Branching and Merging Code with Git Source Control

1 hour
  • 3 Learning Objectives

About this Hands-on Lab

When using Git for source control and versioning, the ability to branch that repository while you make changes off the mainline is key. However, eventually, that branch will need to rejoin the master branch and you will need to perform a merge. In this activity, the student will get an opportunity to perform a branch and then learn how that branch differs from the master, how they can move back and forth between the branch and master and finally, how to merge it back into mainline.

Learning Objectives

Successfully complete this lab by achieving the following learning objectives:

Create the fix-readme Branch

Create a ‘fix-readme’ branch from within the web-api repository, and chagne nto it.

 cd web-api


 git branch fix-readme
 git checkout fix-readme


 git checkout -b fix-readme
Correct the file

Make sure that the file has the correct spelling within the file.

Then commit the file to the fix-readme branch.

 git commit -a -m "fixed the spelling in the file"
Merge the corrected file into the master branch

Merge the corrected file back into the master branch.

  git checkout master
  git merge fix-readme

Additional Resources

One of your company's developers noticed that the word readme was mispelled in the web api's git repository readme file.

The company policy dictates that all modifications are to be made in branches, and that these branches are to remain intact and not deleted. until reviewed by a senior developer.

You have been asked to log into the central server used for maintaining the git repository for the web api, which is located in the cloud_user's home directory, and correct the spelling within the file. You are to use a branch named 'fix-readme', and merge the corrected file back into the master branch when finished. Again, do not remove your branch. Once you have completed this task, hand the system over to the lead developer for approval.

What are Hands-on Labs

Hands-on Labs are real environments created by industry experts to help you learn. These environments help you gain knowledge and experience, practice without compromising your system, test without risk, destroy without fear, and let you learn from your mistakes. Hands-on Labs: practice your skills before delivering in the real world.

Sign In
Welcome Back!

Psst…this one if you’ve been moved to ACG!

Get Started
Who’s going to be learning?