On Mon, May 18, 2009 at 4:38 AM, Matthias Andree <matthias.andree@xxxxxx> wrote: > Have you been working on a branch other than the one that git-svn created > for you? If so, you may have to "git checkout" the original branch before > being able to "git svn rebase". > > Branches and git-svn don't mix. That's not exactly true: merging and git-svn don't mix. But rebasing works fine. If you have a separate branch and do 'git svn rebase', then as far as I know, the original git-svn branch(es) will get updated to the latest version from svn, and then your current branch will be rebased on top of it. This is often what you want, unless you've been using 'git merge' from that branch. Rebasing (unless you know exactly what you're doing) always messes up git merge. Have fun, Avery -- 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