On Wed, 2012-01-25 at 11:32 +0100, Christian Couder wrote: > 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? No. By "merge driver" I mean a "merge driver". > > 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? No. A mergetool is what you call manually to help you resolve a merge conflict. What you're describing is a merge driver. If you grep for "driver" in the merge manpage, you'll see how to set it, and it'll tell you to look in the gitattributes manpage for more information. If you search the web for "git merge driver" you'll see lots of examples of how these are done. cmn
Attachment:
signature.asc
Description: This is a digitally signed message part