Andreu Casablanca 🐀

I just found a relatively new tool for syntax-aware diff/merge operations on git repositories ( #Mergiraf ).

Unlike other tools I've tried in the past, this one is also diff3-friendly  .

- https://mergiraf.org/
- https://lwn.net/Articles/1042355/

For the weirdos like me who prefer `rebase` over `merge` this can be a great mood & productivity booster 

Introduction - Mergiraf

A syntax-aware git merge driver for a growing collection of programming languages and file formats.

Nov 13 at 1:35pmWeb
Show threadDavid CulleyNov 13
@castarco I also prefer rebase over merge. 🙂 Thanks for the recommendation.