Three-Way Merge Concept
Concept Check Medium
Question
What does Git use as the three inputs for a three-way merge?
Hint
Git needs a common reference point.
Explanation
A three-way merge uses three snapshots: the tip of the current branch, the tip of the branch being merged, and their common ancestor (merge base). By comparing each branch tip to the common ancestor, Git can determine what each side changed and combine them intelligently, only flagging conflicts when both sides changed the same lines.
Related Resources
Related Lessons
Related Cheatsheets
Look up unfamiliar terms
A beginner-friendly glossary explains jargon in plain English — variables, functions, DOM, Promise, and more.
Decode error messages
Plain-English explanations of common errors — what they mean, why they happen, and how to fix them.
Build real projects
Apply what you learned by building guided projects with starter code and solutions.