Jonathan Nieder <jrnieder@xxxxxxxxx> writes: > As v1.6.1-rc1~294^2 (2008-08-23) explains, custom merge strategies > do not even kick in when the merge is truly trivial. But they > should, since otherwise a custom “--strategy=theirs” is not useful. I think it is a double-edged sword that trivial merge kicks in for custom strategies. If your mind is focused narrowly on "ours" or "theirs", indeed it may be inconvenient, but on the other hand other custom strategies may not want to run heavy-weight operations if a trivial merge is sufficient. So in the longer term, I suspect that each custom strategy needs to be able to tell the merge machinery if it wants ff and trivial. -- 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