Merge git tool

[OroArmor]

Git doesn't understand mappings so a way to merge two branches, selecting between conflicting names would be amazing.

It looks like custom merge strategies are possible but not easily transferable between computers: https://stackoverflow.com/questions/23140240/git-how-do-i-add-a-custom-merge-strategy