3 ms·
This caused me to search and see if there are tools to leverage ASTs when resolving merge conflicts, and it looks like there are! https://www.semanticmerge.com
by conradev 5y ago
This caused me to search and see if there are tools to leverage ASTs when resolving merge conflicts, and it looks like there are!
https://www.semanticmerge.com/ https://www.semanticmerge.com/
Would be cool if diffsitter added support for facilitating three way merges