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)’?
What is the best way to resolve a conflict when doing a git svn
Share
Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
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)’?
You can use
git mergetoolto view and edit the conflicts in the usual fashion. Once you are sure the conflicts are resolved dogit rebase --continueto continue the rebase, or if you don’t want to include that revision dogit rebase --skip