XITLOG has enabled patch-based merging by default in its version control system, claiming to be the first git-compatible VCS with this feature. This approach reportedly reduces merge conflicts compared to git's three-way merge, particularly avoiding adjacent line conflicts and cherry-picking issues that commonly plague git workflows.
Background
Git has long used three-way merging which can produce conflicts in certain scenarios like adjacent line changes or cherry-picking operations. Developers have built entire workflows around avoiding these git limitations.
- Source
- Lobsters
- Published
- May 2, 2026 at 02:20 AM
- Score
- 6.0 / 10