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

On Tue, Aug 4, 2009 at 9:47 PM, G.zhen.ning[off-list ref] 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