How to resolve ALL conflicts using HEAD, with any mergetool How to resolve ALL conflicts using HEAD, with any mergetool git git