Trusted answers to developer questions
Trusted Answers to Developer Questions

Related Tags

git
github

What are Git branches?

Hafiz Ahmad Shahzad

Overview

Branching is a feature available in most modern version control systems.

Branching in other VCS’s can be an expensive operation in both time and disk space. In Git, branches are a part of your everyday development process. Git branches are effectively a pointer to a snapshot of your changes. When you want to add a new feature or fix a bug, no matter how big or how small, you spawn a new branch to encapsulate your changes.

This makes it harder for unstable code to get merged into the main code base, and it gives you the chance to clean up your future’s history before merging it into the main branch.

Git branch

The diagram above visualizes a repository with two isolated lines of development, one for a small feature, and one for a longer-running feature. By developing them in branches, it’s not only possible to work on both of them in parallel, but it also keeps the main branch free from questionable code.

The implementation behind Git branches is much more lightweight than other version control system models. Instead of copying files from directory to directory, Git stores a branch as a reference to a commit. In this sense, a branch represents the tip of a series of commits. It’s not a container for commits. The history for a branch is extrapolated through the commit relationships.

As you read, remember that Git branches aren’t like SVNApache Subversion branches. Whereas SVN branches are only used to capture the occasional large-scale development effort, Git branches are an integral part of your everyday workflow. The following content will expand on the internal Git branching architecture.

How it works

A branch represents an independent line of development. Branches serve as an abstraction for the edit/stage/commit process. You can think of them as a way to request a brand new working directory, staging area, and project history. New commits are recorded in the history for the current branch, which results in a fork in the history of the project.

The git branch command lets you create, list, rename, and delete branches. It doesn’t let you switch between branches or put a forked history back together again. For this reason, git branch is tightly integrated with the git checkout and git merge commands.

Common commands

git branch 
branch command

List all of the branches in your repository. This is synonymous with git branch --list.

git branch <branch>
branch named <branch>

Create a new branch called <branch>. This does not check out the new branch.

git branch -d <branch>
safe delete

Delete the specified branch. This is a “safe” operation in that Git prevents you from deleting the branch if it has unmerged changes.

git branch -D <branch>
deleting branch

Force delete the specified branch, even if it has unmerged changes. This is the command to use if you want to permanently throw away all of the commits associated with a particular line of development.

git branch -m <branch>
rename

Rename the current branch to <branch>.

git branch -a 
listing branches

List all remote branches.

Creating branches

It’s important to understand that branches are just pointers to commits. When you create a branch, all Git needs to do is create a new pointer, it doesn’t change the repository in any other way. If you start with a repository that looks like this:

main

Then, you create a branch using the following command:

git branch experiment
branch creation

The repository history remains unchanged. All you get is a new pointer to the current commit:

branch:experiment

Note that this only creates the new branch. To start adding commits to it, you need to select it with git checkout, and then use the standard git add and git commit commands.

Deleting branches

Once you’ve finished working on a branch and have merged it into the main code base, you’re free to delete the branch without losing any history:

git branch -d experiment
deleting branch

However, if the branch hasn’t been merged, the above command will output an error message:

error: The branch 'experiment' is not fully merged.

This protects you from losing access to that entire line of development. If you really want to delete the branch (e.g., it’s a failed experiment), you can use the capital -D flag:

git branch -D experiment
delete branch

RELATED TAGS

git
github

CONTRIBUTOR

Hafiz Ahmad Shahzad
Copyright ©2022 Educative, Inc. All rights reserved
RELATED COURSES

View all Courses

Keep Exploring