Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

Why does Bitbucket give two different advises for resolving conflicts in pull request?

hmozaffari August 2, 2019

I noticed a strange behavior from Bitbucket when resolving merge conflicts in a pull request.

When we submit a pull request from source to target branch and there is a conflict, sometimes it suggests checkout source branch and pull target into it and sometimes it suggests checkout target branch and pull source branch.

Why does Bitbucket suggest two different approaches? Second approach sounds more reasonable since we don't want to modify source branch involved in a merge. 

Has anyone faced it and knows the rational behind it?

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events