How to resolve a conflict with git-svn?

Question

What is the best way to resolve a conflict when doing a git svn rebase, and the git branch you are on becomes \"(no-branch)\"?

Answer 1

You can use git mergetool to view and edit the conflicts in the usual fashion. Once you are sure the conflicts are resolved do git rebase --continue to continue the rebase, or if you don't want to include that revision do git rebase --skip