Merge
Combine changes from one branch into another, producing integrated history.
- Finds common ancestor; combines changes.
- Non-overlapping changes merge automatically.
- Conflicts pause for manual resolution.
When to use: Bringing a finished feature branch back into main.
Example: git switch main && git merge feature/login - combines feature/login into main.