GitVersion Control

The Importance of Branching in Git

July 28, 20253 min read
gitversion-controlgithubbest-practices

Branching is one of the most powerful features of Git. It allows developers to diverge from the main line of development and continue to do work without messing with that main line. This enables multiple people to work simultaneously on different features, bug fixes, or experiments in a safe and isolated environment.

Key benefits of branching in Git:

  • Isolation: Each branch is independent, so changes in one branch don’t affect others.
  • Parallel Development: Multiple team members can work on different branches at the same time.
  • Experimentation: You can try new ideas without affecting the main codebase.
  • Code Reviews and Collaboration: Branches make it easy to review and merge changes systematically.
  • Release Management: Separate branches can be used for development, testing, and production releases.

#Step-by-Step Tutorial

#1. Pushing Code to the main or master Branch

#A. Check Your Current Branch

git branch

The branch with an asterisk (*) is your current branch.

#B. Commit Your Changes

git add . 
git commit -m "Your commit message"

#C. Push to main or master

  • If your branch is named main:
git push origin main
  • If your branch is named master:
git push origin master

If this is your first push and the branch doesn’t exist remotely:

git push --set-upstream origin main 
# or 
git push --set-upstream origin master

#2. Pushing Code to a Different Branch with a Different Name

Suppose your local branch is feature-xyz and you want to push it to a remote branch called testing-branch.

#A. Check Your Current Branch

git branch

Make sure you are on feature-xyz. If not, switch to it:

git checkout feature-xyz

#B. Commit Your Changes

git add . git commit -m "Work on feature xyz"

#C. Push to a Remote Branch with a Different Name

git push origin feature-xyz:testing-branch
  • This command pushes your local feature-xyz branch to the remote as testing-branch.

If you want to set it to track the remote branch for future pushes:

git push --set-upstream origin feature-xyz:testing-branch

#Common Errors and Their Solutions

#1. error: src refspec main does not match any

Cause:
You don’t have a branch named main locally.

Solution:
Check your branches with git branch. Use the correct branch name in your push command.

#2. error: failed to push some refs to …

Causes:

  • Your local branch is behind the remote branch.
  • There are merge conflicts.
  • You don’t have permission.

Solution:

  • Pull the latest changes:
git pull origin <branch-name>
  • Resolve any conflicts, commit, then push again.
  • Check your repository permissions.

#3. fatal: The upstream branch does not exist

Cause:
You are trying to push a branch that doesn’t exist remotely.

Solution:
Push and set upstream:

git push --set-upstream origin <local-branch-name>

or (for a different remote name):

git push --set-upstream origin <local-branch-name>:<remote-branch-name>

#4. Updates were rejected because the remote contains work that you do not have locally

Cause:
Your remote branch has new commits you don’t have.

Solution:

  • Pull the changes first:
git pull --rebase origin <branch-name>
  • Resolve conflicts if any, then push.

#5. Authentication Errors

Cause:
You are not authenticated or your credentials are wrong.

Solution:

  • Make sure you have access.
  • If using HTTPS, update your credentials.
  • If using SSH, ensure your SSH key is added to your GitHub/GitLab account.

Originally published on Medium.