Tag
three-way-merge
- 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 28, 2024 Template Ownership When Scaffolding a New Service A generator produces a fork of the template the moment it runs. What that implies for update paths, three-way merges, and the split between generated and referenced configuration. devops