You can use branches in Git to work on different features without affecting your main codebase. For example, you can experiment with a new layout for your webpage on a different branch without affecting the main branch where your website is being deployed from.
Branches are used for different purposes like feature development, bug fixes, versioning, experimentation, contributing to open source projects, and so on.
In this article, you’ll learn how to use different Git commands to interact with remote branches.
I’ve created a repository (repo) for this article with three different branches: main, feat/create-hobbies-list, and feat/create-language-list. You can download the repo here, or clone it to your computer using this command:
git clone https://github.com/ihechikara/git-branches-article.git
The command above downloads the main branch of the repository to your computer.
Feel free to follow along with your own codebase/Git repo.
How to List Remote Branches
When you look at the repo you just cloned on GitHub, you’ll notice that there are three branches.
But when you run the git branch command, you’ll only get a list of branches in the local repo. In our case, that is the main branch. This happens for a couple of reasons:
So how do you list the remote branches? You can do that using the git branch -r command:
git branch -r
origin/HEAD -> origin/main
origin/feat/create-hobbies-list
origin/feat/create-language-list
origin/main
From the command output above, you can see all the branches in the remote repo. The main branch which also acts as the default branch (origin/HEAD), and two other branches: feat/create-hobbies-list and feat/create-language-list.
Now that you know how to list remote branches, let’s see how to fetch and work on them locally.
How to Fetch Remote Branches
You can fetch remote branches for different reasons like code review, updating your local repo with changes made to the remote repo, experimentation, and so on.
How to Fetch Remote Branches Using git fetch
You can use the git fetch command to “fetch” recent changes made to the remote repo without merging them into your local repo.
For example, let’s assume that new changes were pushed to the feat/create-language-list branch. When you run the git fetch command, Git retrieves the new changes in the remote repo but you won’t see them in my local branch/repo.
You can then use commands like git diff and git log to compare the changes.
In a case where you’re satisfied with the changes, you can use the git merge command to merge those changes into your local branch. At this point, the changes from the remote branch will be visible/seen locally.
That is:
git checkout feat/create-language-list
The command above switches to the feat/create-language-list branch.
git fetch
The command above retrieves current changes made to the remote branch that aren’t in your local branch.
git diff feat/create-language-list origin/feat/create-language-list
The command above compares the changes you just fetched with your local branch. In the terminal, the red characters denote the state of your local branch while the green characters denote new changes from the remote branch. That is:
git merge
The command above merges the changes into your local branch. In this case, the languages.txt file will be updated with the new changes.
In summary, git fetch retrieves the changes while git merge merges the changes to your local branch.
How to Fetch Remote Branches Using git pull
The git pull command is similar to git fetch and git merge.
The difference is that git pull automatically merges new changes into your local branch. That is, you don’t get to compare changes before merging (you won’t get the chance to run git diff).
git pull executes both git fetch and git merge at the same time.
So once you run the git pull command, the remote changes will appear locally if there are no merge conflicts.
In this article, you learned how to list remote branches using the git branch -r command.
You also learned how to fetch remote branches. The git fetch command fetches changes from the remote branch while the git merge command merges the remote changes to your local branch. This process give you the opportunity to compare changes before merging them.
On the other hand, the git pull command automatically fetches and merges changes from a remote branch as long as there are no merge conflicts.
Happy coding!
