no-branch

How to resolve a conflict with git-svn?

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)"? ...

Why did git set us on (no branch)?

This morning we pull from our repo, and git put us on (no branch). I don't understand this, why did this happen? And how get out of it without losing our changes? ...