From: "Carlos Martín Nieto" <cmn@elego.de>
To: Christian Couder <christian.couder@gmail.com>
Cc: mike@nahas.com, git@vger.kernel.org
Subject: Re: Rebase and incrementing version numbers
Date: Wed, 25 Jan 2012 11:53:40 +0100 [thread overview]
Message-ID: <1327488820.3052.15.camel@beez.lab.cmartin.tk> (raw)
In-Reply-To: <CAP8UFD0gd_-=Cc0vox-6Ts4-iBWcJG8LgmqXteXgp3qc-bX13w@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 984 bytes --]
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@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?
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 #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
next prev parent reply other threads:[~2012-01-25 10:53 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CADo4Y9jGYJasDL9m7_50aOTrOyoezdyg=vcsZhQ87Qk-1XfTUQ@mail.gmail.com>
2012-01-19 17:20 ` Rebase and incrementing version numbers Michael Nahas
2012-01-19 18:12 ` demerphq
2012-01-19 18:48 ` Michael Nahas
2012-01-19 19:58 ` PJ Weisberg
2012-01-19 20:06 ` Michael Nahas
2012-01-19 23:31 ` Santi Béjar
2012-01-25 2:18 ` John Szakmeister
2012-01-19 19:20 ` Carlos Martín Nieto
2012-01-19 20:02 ` Michael Nahas
2012-01-20 15:53 ` Carlos Martín Nieto
2012-01-25 10:32 ` Christian Couder
2012-01-25 10:53 ` Carlos Martín Nieto [this message]
2012-01-25 11:18 ` Christian Couder
2012-01-19 21:07 ` Jehan Bing
2012-01-19 21:33 ` Jon Seymour
2012-01-25 2:09 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1327488820.3052.15.camel@beez.lab.cmartin.tk \
--to=cmn@elego.de \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=mike@nahas.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).