From: Junio C Hamano <gitster@pobox.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Holger Hellmuth <hellmuth@ira.uka.de>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
kusmabite@gmail.com, Git Mailing List <git@vger.kernel.org>
Subject: Re: git add -p and unresolved conflicts
Date: Wed, 28 Mar 2012 16:05:51 -0700 [thread overview]
Message-ID: <7vfwcss4vk.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <7vk424s52z.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Wed, 28 Mar 2012 16:01:24 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> There is a crucial step missing. After running "cherry-pick --no-commit",
> you would eyeball the result, and typically edit the file. The conflict
> may not be in the part of the file you are interested in picking, in which
> case you may even leave that part as-is. And then, you would pick what
> you want to apply to the index during per-hunk interactive patching
> session.
Strictly speaking, you do not even have to edit the file. If the conflict
does not overlap the part of the change you are interested in, a
hypothetical version of "add -p" that is oblivious to merge conflicts
(i.e. running "reset $path" before starting "add -p") could help you apply
the changes the picked commit makes relative to its parents to your
current state.
next prev parent reply other threads:[~2012-03-28 23:06 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
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 [this message]
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=7vfwcss4vk.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--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.