git/list[1] front-page[2] threads[3] people[4] search[5] about
 

git-svn rebase can change branches during merge?

From
Kevin Williams <kevwil@gmail.com>
Date
Mar 16, 2009, 20:49 UTC
Message-ID
<683a886f0903161349k172679a6t24cc4e393aea8f2d@mail.gmail.com>

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: Jan Krüger
Message 1 of 3 in “git-svn rebase can change branches during merge?”
  1. Kevin WilliamsMar 16, 2009
  2. Jan KrügerMar 16, 2009
  3. Kevin WilliamsMar 17, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.