From: Paulo Matos <paulo@matos-sorge.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: Unexpected cherry-pick behaviour
Date: Wed, 11 Dec 2013 10:04:26 +0000 [thread overview]
Message-ID: <7050e7272bb83d083a56a2c391228ed8@matos-sorge.com> (raw)
In-Reply-To: <xmqqvbywts9d.fsf@gitster.dls.corp.google.com>
On 10/12/2013 19:34, Junio C Hamano wrote:
> Perhaps immediately after "cherry-pick" stopped and asked your help
> to resolve the conflicts, running
>
> $ git checkout --conflicts=diff3 gcc/tree-ssa-threadedge.c
>
> and looking at the file again may show you what is going on better.
I don't know how to interpret the fact that the line you sent (with the
obvious --conflicts being --conflict) outputs nothing...
Any suggestions?
--
Paulo Matos
next prev parent reply other threads:[~2013-12-11 10:04 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-10 11:04 Unexpected cherry-pick behaviour Paulo Matos
2013-12-10 19:34 ` Junio C Hamano
2013-12-11 10:04 ` Paulo Matos [this message]
2013-12-11 11:09 ` Antoine Pelisse
2013-12-11 11:19 ` Paulo Matos
2013-12-14 9:40 ` Antoine Pelisse
2013-12-14 14:53 ` Philip Oakley
2013-12-14 19:39 ` Junio C Hamano
2013-12-15 14:48 ` Philip Oakley
2013-12-16 19:00 ` Philip Oakley
2013-12-16 20:15 ` Junio C Hamano
2013-12-14 19:33 ` Junio C Hamano
2013-12-14 19:47 ` Antoine Pelisse
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=7050e7272bb83d083a56a2c391228ed8@matos-sorge.com \
--to=paulo@matos-sorge.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).