Tag
rerere
- Jan 11, 2026 Conflict Markers, Merge Drivers, and Recorded Resolutions How conflict markers encode the three inputs, how an attribute-selected merge driver replaces the line-based algorithm, and how rerere replays a resolution it has seen before. software engineering
- 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