4 ms·
Interesting, I found Semantic Merge [1] years ago but it was never open source. This just does diff but not merge, but at least it's open source - and the diff
by sanity 3y ago
Interesting, I found Semantic Merge [1] years ago but it was never open source.
This just does diff but not merge, but at least it's open source - and the diffs look a lot nicer, I've already made it my default.
Any plans to extend it to merging?
[1] https://docs.plasticscm.com/semanticmerge https://docs.plasticscm.com/semanticmerge
- rideontime 3y agoWas going to suggest this myself, this was a godsend when I was working with a big team on a C# project going through a messy refactor.
- OJFord 3y ago> Any plans to extend it to merging? The GitHub readme: > Can difftastic do merges? > No. AST merging is a hard problem that difftastic does not address. > AST diffing is a also lossy process from the perspective of a text diff. Difftastic will ignore whitespace that isn't syntactically significant, but merging requires tracking whitespace.