From: Junio C Hamano <junkio@cox.net>
To: Kevin Geiss <kevin@desertsol.com>
Cc: git@vger.kernel.org
Subject: Re: git rebase conflict help?
Date: Thu, 17 Nov 2005 15:21:26 -0800 [thread overview]
Message-ID: <7voe4isvwp.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <33D6F7FB-7864-471B-A111-9991C768577A@desertsol.com> (Kevin Geiss's message of "Thu, 17 Nov 2005 15:20:25 -0700")
Kevin Geiss <kevin@desertsol.com> writes:
> I fetched my origin branch, then tried to run 'git rebase origin'.
> one of my commits from master which is not yet in origin got a
> conflict, so git rebase origin told me that the Simple cherry-pick
> failed, and the Automatic cherry-pick got conflicts. and it saved the
> commit message for me in .msg and my offending commit's id in .rebase-
> tmp32409.
Sorry, the tool support for this situation is very poor in the
original rebase code.
With the tool you have, you need to make sure that the working
tree matches the (halfway) rebased master's head, and run
"git-cherry-pick --replay $commit" on the offending commits
stored in .rebase-tmp$$, one by one.
next prev parent reply other threads:[~2005-11-17 23:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-11-17 22:20 git rebase conflict help? Kevin Geiss
2005-11-17 23:21 ` Junio C Hamano [this message]
2005-11-18 8:04 ` Franck Bui-Huu
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=7voe4isvwp.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=kevin@desertsol.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).