From: Franck Bui-Huu <franck.bui-huu@innova-card.com>
To: Kevin Geiss <kevin@desertsol.com>
Cc: git@vger.kernel.org
Subject: Re: git rebase conflict help?
Date: Fri, 18 Nov 2005 09:04:28 +0100 [thread overview]
Message-ID: <437D8B0C.3010608@innova-card.com> (raw)
In-Reply-To: <33D6F7FB-7864-471B-A111-9991C768577A@desertsol.com>
Kevin Geiss wrote:
> 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.
>
> I'm not sure how to proceed from here. actually, I know what the
> offending changes are, and I could re-do the changes by hand and
> commit them again, but I'd like to know what git tools I'm supposed
> to use in this case...
>
You can take a look at this:
http://www.gelato.unsw.edu.au/archives/git/0508/7789.html
Franck
prev parent reply other threads:[~2005-11-18 8:06 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
2005-11-18 8:04 ` Franck Bui-Huu [this message]
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=437D8B0C.3010608@innova-card.com \
--to=franck.bui-huu@innova-card.com \
--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).