How to Fix Divergent Branches in Git: Simple Steps

Divergent branches in Git happen when two branches have different commits that don't share a common history. To fix this, use git merge to combine changes or git rebase to replay commits on top of another branch, resolving conflicts if any.

Why This Happens

Divergent branches occur when two branches have progressed separately with different commits. This means their histories have diverged and Git cannot fast-forward to update one branch with the other's changes.

This often happens when you and someone else work on the same branch but push different commits, or when you try to pull changes without syncing first.

bash

git checkout feature
# Make some commits
# Someone else pushes different commits to origin/feature

git pull origin feature

Output

error: Your local branch and 'origin/feature' have diverged,
and have 2 and 3 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

The Fix

To fix divergent branches, you can either merge or rebase. Merging creates a new commit combining both histories. Rebasing moves your commits on top of the updated branch, creating a linear history.

Choose merge if you want to keep all history visible. Choose rebase if you want a clean, linear history.

bash

git fetch origin
# Option 1: Merge
git merge origin/feature

# Option 2: Rebase
# git rebase origin/feature

Output

Merge option output example:
Updating abc1234..def5678
Fast-forward
 file.txt | 2 ++
 1 file changed, 2 insertions(+)

Rebase option output example:
First, rewinding head to replay your work on top of it...
Applying: Added new feature

Prevention

To avoid divergent branches, always pull changes before pushing your commits. Use git pull --rebase to keep history linear. Communicate with your team to avoid working on the same branch simultaneously without syncing.

Regularly sync your branches and consider using feature branches for isolated work.

Related Errors

Other common Git errors related to divergent branches include:

• Merge conflicts: Happens when changes overlap and Git cannot auto-merge. Fix by manually editing files.
• Non-fast-forward updates: Occurs when pushing without pulling first. Fix by pulling or force pushing carefully.

Key Takeaways

Divergent branches happen when local and remote branches have different commits.

Fix by merging or rebasing to combine histories and resolve conflicts.

Always pull or fetch before pushing to avoid divergence.

Use feature branches and communicate with your team to reduce conflicts.

Understand merge conflicts and non-fast-forward errors as related issues.