Tag
conflict-resolution
- Sep 1, 2026 Three-Way Merge and How the Merge Base Is Chosen Why merging compares two tips against a common ancestor rather than against each other, how the base is selected when history is criss-crossed, and where the approach loses information. software engineering
- 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
- May 11, 2026 Version Vectors and Conflict Detection in Multi-Writer Replication How per-replica counters encode causal history, why vector comparison identifies concurrency that timestamps hide, and what the vectors cost in metadata and pruning. distributed systems
- Jan 20, 2026 Replaying a Queue Against State That Has Moved On When queued writes finally reach the server, the world may have changed beneath them; version vectors, field-level merge rules, and conflict surfacing decide what survives. mobile computing
- 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
- Apr 22, 2025 Conflict Resolution When Two Regions Accept Writes Last-writer-wins, version vectors, and application merge: what each guarantees about concurrent cross-region updates, and which invariants each one breaks. cloud infrastructure