Skip to main content
In this lesson, you will learn how to leverage Git branches and remote repositories to manage different versions of your code, track modifications, merge changes, and effectively collaborate with your team. ──────────────────────────────

​
Understanding Branches

Running the “git status” command might produce output similar to the following:
Git branches allow you to develop different versions of your project simultaneously. For example, if version 1.0 is already in production and requires bug fixes while new features are developed for version 1.1, you can create separate branches for each. The master branch is the default branch that typically holds your stable, released version. Imagine your master branch is currently at version 1.0 with file1 and file2. The diagram below illustrates this concept by presenting the “Master branch” as the stable codebase accessed by users.
The image illustrates a diagram of Git branches, highlighting the "Master branch" as the stable version, with users accessing it.
To experiment or develop new features without affecting the master branch, create a new branch. In this case, the branch is named “1.1-testing” to indicate that it is under development.
The image illustrates a Git branching structure, showing a "Master branch" with a "1.0 Branch" and a "1.1 - testing" branch, each containing files with different versions.
──────────────────────────────

​
Working with Branches in the Terminal

You can easily create and switch to a new branch using the following commands:
Now that you are on the 1.1-testing branch, open “file2” in your preferred editor and make your modifications (for example, update a line to “This is the IMPROVED line of code in file2”). Then, run “git status” to see that your changes have been detected:
Before committing, always add your changes to the staging area using “git add” to ensure that only the intended modifications are committed.
Proceed to add and commit your changes:
At this point, the improvements exist only in the 1.1-testing branch, leaving the master branch unchanged. ──────────────────────────────

​
Viewing Commit History

To review the history of your Git commits, use the Git log. Executing the following command provides detailed commit entries:
In the log output, symbols indicate file actions: A for added, D for deleted, and M for modified files. Each commit is identified by a unique hash value. To inspect the changes in a specific commit, use the “git show” command along with part of the commit hash. For example, a diff might resemble:
If you switch back to the master branch, you’ll notice that it remains one commit behind. For example:
This demonstrates that the HEAD pointer reflects the state of the current branch. ──────────────────────────────

​
Merging Branches

Once you have verified the improvements on the 1.1-testing branch, you can merge these changes back into the master branch. First, switch to the master branch:
Then, merge the 1.1-testing branch:
After the merge, the master branch now includes the improvements made in file2:
──────────────────────────────

​
Working with Remote Repositories

Up until now, you have been working with your local repository. In collaborative environments, it’s vital to synchronize your changes with a remote repository hosted on platforms like GitHub or GitLab.

​
Pushing Local Changes

Pushing your local commits to a remote repository ensures that your collaborators can access the latest version of your project. Start by checking the current remote configuration:
If there’s no remote configured, add one using the connection string provided by your hosting platform:
Push the changes on the master branch to your remote repository:
Follow any prompts regarding host authenticity if this is your first connection. ──────────────────────────────

​
Configuring SSH Keys

For secure communication with Git remote repositories, it’s recommended to use SSH keys. To generate an SSH key pair, run:
Once your keys have been generated, view your public key:
Copy the displayed key and add it to your GitHub account under Settings → SSH and GPG keys.
The image shows a GitHub settings page where a user is adding a new SSH key, with options for key type and a field for the key itself.
After adding your SSH key, you can securely push your changes. ──────────────────────────────

​
Cloning a Remote Repository

When a new team member joins, they can easily clone the remote repository to get the entire project history. For example:
This command creates a local directory named “kkproject” along with a hidden .git folder containing all commit history.
The image shows a GitHub repository page for "kkproject" with options to clone the repository using HTTPS, SSH, or GitHub CLI. It also suggests adding a README file.
──────────────────────────────

​
Getting Additional Help

Git is a powerful tool with a wide range of features. If you ever need assistance or a reminder of a command’s options, simply type “git” and press the tab key twice to see a list of commands. For in-depth information on any command, you can consult the manual pages:
A sample Git log entry may look like this:
For further reading and advanced Git techniques, please visit the KodeKloud Git Documentation.
The image shows a section of the Git manual for the git-add command, detailing its name, synopsis, and description. It explains how the command updates the index with content from the working tree for the next commit.
────────────────────────────── This lesson has covered the fundamental techniques for working with Git branches and remote repositories. Continue with our next lesson to further enhance your Git skills.

Watch Video

Practice Lab