From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Holger Hellmuth <hellmuth@ira.uka.de>
Cc: Junio C Hamano <gitster@pobox.com>,
kusmabite@gmail.com, Git Mailing List <git@vger.kernel.org>
Subject: Re: git add -p and unresolved conflicts
Date: Wed, 28 Mar 2012 21:38:42 +0200 [thread overview]
Message-ID: <vpqk424zfb1.fsf@bauges.imag.fr> (raw)
In-Reply-To: <4F73632E.1060408@ira.uka.de> (Holger Hellmuth's message of "Wed, 28 Mar 2012 21:14:54 +0200")
Holger Hellmuth <hellmuth@ira.uka.de> writes:
> and additionally the following three options:
> b - choose the base version
> < - choose our version
> > - choose their version
What does it mean to "choose" in this context? In general, it means "put
this into the index", but if the file is in conflicted state, you have 3
different versions of the file in the index.
And you miss the most usefull (to me at least): "choose the version in
the worktree".
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2012-03-28 19:39 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-28 9:51 git add -p and unresolved conflicts Erik Faye-Lund
2012-03-28 15:10 ` Junio C Hamano
2012-03-28 15:21 ` Matthieu Moy
2012-03-28 19:14 ` Holger Hellmuth
2012-03-28 19:19 ` Junio C Hamano
2012-03-28 19:52 ` Holger Hellmuth
2012-03-29 6:08 ` Jeff King
2012-03-29 10:19 ` Holger Hellmuth
2012-03-28 19:38 ` Matthieu Moy [this message]
2012-03-28 19:54 ` Junio C Hamano
2012-03-28 20:10 ` Holger Hellmuth
2012-03-28 20:50 ` Junio C Hamano
2012-03-28 22:50 ` Holger Hellmuth
2012-03-28 23:01 ` Junio C Hamano
2012-03-28 23:05 ` Junio C Hamano
2012-03-29 1:32 ` Holger Hellmuth
2012-03-29 7:26 ` Matthieu Moy
2012-03-29 21:08 ` Junio C Hamano
2012-03-30 8:11 ` Matthieu Moy
2012-03-28 15:33 ` Erik Faye-Lund
2012-03-28 17:17 ` Junio C Hamano
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=vpqk424zfb1.fsf@bauges.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hellmuth@ira.uka.de \
--cc=kusmabite@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.