3 ms·
Don't forget mergiraf, for tree-sitter-based conflict resolution: https://mergiraf.org/ https://mergiraf.org/
by NateEag 3mo ago
Don't forget mergiraf, for tree-sitter-based conflict resolution:
https://mergiraf.org/ https://mergiraf.org/
- klibertp 3mo agoI absolutely love the images on the landing page. "Inappropriate use of blame, push and pull to resolve a conflict" is pure genius. Even the name had a lot of thought put into it (didn't know about "Giraffe language" before). Beautiful! :)
- NateEag 3mo agoThe documentation is truly a thing of beauty. As someone who learned a lot from Non-Violent Communication, discovering mergiraf went something like > ...oh, cool - I've wanted this for years, great that someone buckled down and wrote it. > > Why 'mergiraf,' though? > > [Sees NVC link on the site] > > ...OH. Conflict resolution through understanding. That's absolutely brilliant, at so many levels.