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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
