Git — Merge Branch

Basic Merge

git checkout main
git merge feature-branch

Merge Types

Fast-Forward

# When main hasn't changed
git merge feature
# Simply moves pointer

Three-Way Merge

# When both branches have commits
git merge feature
# Creates merge commit

Merge Conflicts

# Conflicts look like
<<<<<<< HEAD
Current branch content
=======
Branch content being merged
>>>>>>> feature-branch

Resolve Conflicts

# 1. Edit files to resolve
# 2. Mark as resolved
git add .
# 3. Complete merge
git commit -m "Merge feature into main"

Abort Merge

git merge --abort

Merge Strategies

Strategy	Description
--no-ff	Create merge commit
--squash	Combine all commits
--rebase	Rebase onto branch

Mini Practice

1. Merge a feature branch
2. Handle merge conflicts
3. Use --no-ff flag
4. Squash merge

Up Next

Continue with Rebase — rebasing branches.