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.
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.
git branch fix-readme git checkout fix-readme
git checkout -b fix-readme
- Correct the README.md file
Make sure that the README.md 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 README.md file"
- Merge the corrected README.md file into the master branch
Merge the corrected README.md file back into the master branch.
git checkout master git merge fix-readme