From: Adam Brewster <adambrewster@gmail.com>
Date: Wed, 05 Aug 2009 03:46:01 GMT
Subject: Re: what's wrong wtih my rebase? (git-svn)
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
>