Using merge drivers for specific merges
05:36 29 May 2026

This just a time saver for me but sometimes I do something like:
git merge branch-b

and there is a conflict, when I do the diff I see that it could be solved by just adding the changes together e.g. via the union driver.

I only now how to use drivers by .gitattributes for specific files, but it would be handy to tell git "just use union for all current conflicts"

git git-merge git-merge-conflict