From: Kevin Williams <kevwil@gmail.com>
To: git@vger.kernel.org
Subject: git-svn rebase can change branches during merge?
Date: Mon, 16 Mar 2009 14:49:35 -0600 [thread overview]
Message-ID: <683a886f0903161349k172679a6t24cc4e393aea8f2d@mail.gmail.com> (raw)
I've outlined steps where I can reproduce this bug here:
http://gist.github.com/80058
When using "git svn rebase" and there is a conflict between a local
(git) change and an upstream (svn) change, the local git repository is
left in a ghost-branch. It shouldn't change branches during a rebase,
should it? I also seem to be unable to recover from the merge
conflict, but that may be just due to the noob at the keyboard (me).
I tried working through this with some folks in the #git channel last
week but they were stumped as well.
I'm using the latest Git build from MacPorts (1.6.2.1 as of today) on
a MacbookPro with OS X 10.5.6 (fully updated with all patches)
--
Cheers,
Kevin Williams
next reply other threads:[~2009-03-16 20:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-16 20:49 Kevin Williams [this message]
2009-03-16 22:36 ` git-svn rebase can change branches during merge? Jan Krüger
2009-03-17 4:34 ` Kevin Williams
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=683a886f0903161349k172679a6t24cc4e393aea8f2d@mail.gmail.com \
--to=kevwil@gmail.com \
--cc=git@vger.kernel.org \
/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).