Branching and Merging

Back: Version Control

Strategies for combining work from different branches. Each approach has tradeoffs in history readability, conflict handling, and bisectability. Teams should establish a consistent strategy.

Concepts

• Merge Commits
• Rebase
• Squash Merge
• Cherry-Pick
• Conflict Resolution

---

git branching merging