How to resolve a conflict with git-svn?
While doing a git svn rebase, if you have merge conflicts here are some things to remember: 1) If anything bad happens while performing a rebase you will end up on a (no-branch) branch. 2) If you run git status, you’ll see a .dotest file in your working directory. This is safe to ignore. 3) … Read more