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

Re: git svn rebase problem

From
Avery Pennarun <apenwarr@gmail.com>
Date
May 18, 2009, 17:00 UTC
Message-ID
<32541b130905181000v34d5fd6arcb662bff232cb81c@mail.gmail.com>
In-Reply-To
<op.ut4aagco1e62zd@merlin.emma.line.org>
On Mon, May 18, 2009 at 4:38 AM, Matthias Andree <matthias.andree@gmx.de> wrote:
Show 5 quoted lines
> 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
Previous: Matthias AndreeNext: Miles Bader
Message 5 of 6 in “git svn rebase problem”
  1. David H. Lynch J.rMay 15, 2009
  2. Avery PennarunMay 15, 2009
  3. John TapsellMay 16, 2009
  4. Matthias AndreeMay 18, 2009
  5. Avery PennarunMay 18, 2009
  6. Miles BaderMay 19, 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.