From: Christian Couder <christian.couder@gmail.com>
Date: Wed, 25 Jan 2012 10:32:08 GMT
Subject: Re: Rebase and incrementing version numbers
Message-ID: <CAP8UFD0gd_-=Cc0vox-6Ts4-iBWcJG8LgmqXteXgp3qc-bX13w@mail.gmail.com>
In-Reply-To: <1327000803.5947.59.camel@centaur.lab.cmartin.tk>

On Thu, Jan 19, 2012 at 8:20 PM, Carlos Martín Nieto <cmn@elego.de> 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.