Jakub Narebski <jnareb@xxxxxxxxx> writes: > You can also use custom merge strategies, but that is probably > overkill, and I am not sure that it would work (adding new strategy) > without modifying git. Merge strategies are primarily for people who want to customize the way how the final shape of the resulting tree is determined. Even if you go that route, you would need to write and use your own merge driver anyway in order to tweak the way how the file-level three-way merge is performed. So it is not just an overkill, but it is entirely pointless, as it buys nothing to use a custom merge strategy in this case. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html