Re:A Coherent Vision for the Future of Version Control
by ericpauley on Sunday March 22, 2026 @02:05PM
(#47480305)
Yeah this seems silly. You can do the same thing in git (add and commit with the conflict still there)! Why you would want to is a real mystery.
[ Parent
| on HN ]
Re:A Coherent Vision for the Future of Version Control
by fweimer on Sunday March 22, 2026 @02:28PM
(#47480557)
It allows review of the way the merge conflict has been resolved (assuming those changes a tracked and presented in a useful way). This can be quite helpful when backporting select fixes to older branches.