On Tue, Aug 4, 2009 at 9:47 PM, G.zhen.ning<g.zhen.ning@xxxxxxxxx> 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 > -- 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