How to Use Git Branching

Branching is one of the most important features in Git. This article introduces how to create and manage branches in Git.

The Concept of Branches

Branching is one of Git's powerful features that creates a separate line of development for independent work. Using branches, you can work on different tasks simultaneously and merge them later.

Creating a Branch

To create a new branch, use the git branch command.

$ git branch <branch-name>

Switching Branches

To switch to a different branch, use the git checkout command.

$ git checkout <branch-name>

Creating and Switching Branches Simultaneously

To create a branch and switch to it at the same time, use the -b option.

$ git checkout -b <branch-name>

Merging Branches

Once your work is complete, you can merge the branch into the main branch. Use the git merge command to perform a merge.

Basic Merge

A basic merge is performed as follows.

$ git checkout <main-branch>
$ git merge <branch-name>

Resolving Merge Conflicts

Conflicts may occur during the merge process. When a conflict occurs, Git will notify you, and you need to resolve it manually before committing the changes.

$ git add <filename>
$ git commit

Deleting Branches

Branches that are no longer needed can be deleted. Use the -d option to delete a branch.

$ git branch -d <branch-name>

Force Deleting a Branch

To force delete a branch that has not been merged, use the -D option.

$ git branch -D <branch-name>

Remote Branches

You can also manage branches on remote repositories. Use the git push command to push changes to a remote branch.

Pushing a Remote Branch

$ git push origin <branch-name>

Deleting a Remote Branch

To delete a remote branch, do the following.

$ git push origin --delete <branch-name>

We have covered the basics of Git branching. You can use these commands to effectively manage branches in Git.

Quiz