3 ms·
You know, is there anything like the Language Server Protocol for diff/merge resolution? Seems like there's an opportunity to build a system for semantic aware
by jayd16 4y ago
You know, is there anything like the Language Server Protocol for diff/merge resolution? Seems like there's an opportunity to build a system for semantic aware merge that's language/format aware and tool agnostic (and auto configurable to boot).
Suddenly binary formats could become mergeable.
- zie 4y agoSee [Pijul](https://pijul.org/manual/theory.html https://pijul.org/manual/theory.html). They did that hard work.
- samatman 4y agoHmm I'm a huge fan of pijul, looks like the future of change management from where I'm sitting, but no: they have not. Semantic diffing needs something like pijul, but a system taking advantage of this doesn't yet exist. Pijul avoids some merge conflicts by design, won't do the wrong thing, and handles conflicts correctly: we still need tools with a fuller awareness of what strings mean to have rich semantic diffs.
- zie 4y agoTrue, Pijul only offers the safe diff/patch part.