Skip to content

Resolve conflicts with a pull request (I am a noob at this) #23384

Discussion options

You must be logged in to vote

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:

Yeah, there’s repetitions of the same error in here:

2018-04-25T12:43:38.725Z - error: [ui] `git -c credential.helper= checkout --progress overleaf/master -b master --` exited with an unexpected code: 128.
fatal: A branch named 'master' already exists.

I gather that the existing master is tracking origin/master or something similar.

A potential solution for this would be to, in cases where an existing local branch exists and will clash, use…

Replies: 2 comments

Comment options

You must be logged in to vote
0 replies
Answer selected
Comment options

You must be logged in to vote
0 replies
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
2 participants