Resolve conflicts with a pull request (I am a noob at this) #23384
-
I am at this page is my repository:
Rubberband pre-release update
I downloaded github desktop to cherry pick and resolve conflicts, but I click on the link where it says “You can also [open this in GitHub Desktop]”. An error message comes up in the app that says “A branch with that name already exists”. How do I resolve this? |
Beta Was this translation helpful? Give feedback.
Replies: 2 comments
-
Hello @will2asher, According to others that have experienced the same issue, it looks like the branch ‘master’ is clashing since there’s already a ‘master’ branch, however I could be wrong. @shiftkey explains the issue here. I’ll put his quote below:
I would think that changing the branch would fix the error that you’re experiencing. Would you try changing the branch name to something other than ‘master’ and see if that fixes the error? Here’s a guide on GitHub on how to do that. Let me know if this fixes the error that you’re having or if you’re still experiencing the same issue. Thanks, |
Beta Was this translation helpful? Give feedback.
-
That fixes that issue. (I hope I don’t need to make a new thread for me next questions.) |
Beta Was this translation helpful? Give feedback.
Hello @will2asher,
According to others that have experienced the same issue, it looks like the branch ‘master’ is clashing since there’s already a ‘master’ branch, however I could be wrong. @shiftkey explains the issue here. I’ll put his quote below: