Lab
A Cloud Guru

Branching and Merging Code with Git Source Control

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.

Try for free Contact sales

Path Info

Level

Beginner

Duration

1h 0m

Published

Mar 30, 2018

Challenge

Create the fix-readme Branch
Create a 'fix-readme' branch from within the web-api repository, and chagne nto it.
```
 cd web-api
```
then
```
 git branch fix-readme
 git checkout fix-readme
```
or
```
 git checkout -b fix-readme
```
Challenge

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"
```
Challenge

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
```

Author

A Cloud Guru

The Cloud Content team comprises subject matter experts hyper focused on services offered by the leading cloud vendors (AWS, GCP, and Azure), as well as cloud-related technologies such as Linux and DevOps. The team is thrilled to share their knowledge to help you build modern tech solutions from the ground up, secure and optimize your environments, and so much more!

What's a lab?

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.