5.4.1. Branching Strategies and Merge Conflicts

Common Branching Models:

Merge Conflict Resolution:

# Conflict happens during merge
git merge feature-x
# AUTO-MERGING FAILED in file.txt — conflict markers inserted

# Conflict markers in the file:
<<<<<<< HEAD
current branch content
=======
incoming branch content
>>>>>>> feature-x

# Resolve: edit file, remove markers, keep desired content
vim file.txt
git add file.txt                  # Stage resolved file
git commit                        # Complete the merge

# Or use a merge tool
git mergetool                     # Opens configured merge tool
git config --global merge.tool vimdiff

# Abort a merge in progress
git merge --abort

Rebasing:

# Rebase rewrites history — use only on private branches
git rebase main                   # Apply current branch commits on top of main
git rebase -i HEAD~3              # Interactive rebase — squash, reorder, edit last 3 commits
# Interactive rebase options:
# pick   — keep commit as-is
# squash — combine with previous commit
# edit   — pause to amend commit
# drop   — remove commit

# After rebasing, push requires force (history changed)
git push --force-with-lease origin feature-x  # Safer than --force