Skip to content

Contact sales

By filling out this form and clicking submit, you acknowledge our privacy policy.
  • Labs icon Lab
  • A Cloud Guru
Google Cloud Platform icon

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.

Google Cloud Platform icon

Path Info

Clock icon Beginner
Clock icon 1h 0m
Clock icon Mar 30, 2018

Contact sales

By filling out this form and clicking submit, you acknowledge our privacy policy.

Table of Contents

  1. Challenge

    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
  2. Challenge

    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"
  3. Challenge

    Merge the corrected file into the master branch

    Merge the corrected file back into the master branch.

      git checkout master
      git merge fix-readme

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.

Provided environment for hands-on practice

We will provide the credentials and environment necessary for you to practice right within your browser.

Guided walkthrough

Follow along with the author’s guided walkthrough and build something new in your provided environment!

Did you know?

On average, you retain 75% more of your learning if you get time for practice.

Start learning by doing today

View Plans