git rebase branching svn merge
See more