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

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
```