On Thu, Jan 19, 2012 at 8:20 PM, Carlos Martín Nieto <cmn@xxxxxxxx> wrote: > You could write a merge driver that detects this situation and writes in > a higher number, but it's all working around the fact that it's a race > condition. By "merge" driver you mean a new merge startegy? Isn't it possible to write a script and use it with git mergetool to automatically detect and resolve the merge conflicts resulting from changes in these numbers? Regards, Christian. -- 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