How to resolve a conflict with git-svn?

Question

What is the best way to resolve the conflict when creating the git svn rebase and the git you are on becomes "(without branching)"?

Answer 1

You can use git mergetool to view and edit conflicts in the usual way. Once you are sure that conflicts are resolved, run git rebase --continue to continue rebase, or if you do not want to enable this revision do git rebase --skip

Answer 2

When doing git svn rebase , if you have merge conflicts, you need to remember a few things:

1) If something goes wrong during rebase, you will be taken to a (no-branch) .

2) If you run git status , you will see the .dotest file in your working directory. It is safe to ignore.

3) If you want to abort the reinstall, use the following command. ^one

 git rebase --abort 

4) If you have a merge conflict:

• Manually edit files to resolve conflicts
• Build any changes with git add [file]
• Continue rebooting with git rebase --continue ²
  • If git asks: “did you forget to call git add ?”, Then editing turned the conflict into a no-op ³ variable. Continue with git rebase --skip

You may need to repeat this process until the overflow is complete. You can git rebase --abort at any time to cancel and refuse rebase.

---

_{1: there is no --abort option for git svn rebase --abort .}

_{2: There is no --continue option for git svn rebase .}

_{3: This is very strange, but the files are in a state where git thinks they are the same after this particular patch. The solution is to skip this patch on rebase.}