Tag
merge-algorithms
- Jun 22, 2026 Merge Bases and the Three-Way Merge Walk Why a merge needs a common ancestor, how the best common ancestor is chosen, and what the diff3 procedure does when both sides touch the same region. developer tools
- Jan 23, 2025 Criss-Cross Merges, Virtual Ancestors, and Rename Conflicts What happens when a branch pair has several merge bases, how a synthetic ancestor is built, and why rename conflicts cannot be resolved automatically. developer tools