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

Re: what's wrong wtih my rebase? (git-svn)

From
Adam Brewster <adambrewster@gmail.com>
Date
Aug 5, 2009, 03:46 UTC
Message-ID
<c376da900908042046p1ae1a59dr6bc50fa7812a1968@mail.gmail.com>
In-Reply-To
<44ceb8150908041847mbf7d238r60a59ee40ef6e232@mail.gmail.com>
On Tue, Aug 4, 2009 at 9:47 PM, G.zhen.ning<g.zhen.ning@gmail.com> wrote:
> git svn fetch
> git svn rebase
> git diff
> vim my.html.erb                (resolve the conflict)
? git add html.erb   # (tell git you resolved the conflict)
> git rebase --continue
>
Previous: G.zhen.ning
Message 2 of 2 in “what's wrong wtih my rebase? (git-svn)”
  1. G.zhen.ningAug 5, 2009
  2. Adam BrewsterAug 5, 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.