When Bitbucket recognizes that you would have a conflict if you merged your PR branch it displays a UI like:
This pull request has conflicts.
You must resolve the conflicts by manually merging parent-branch into this branch. After the conflicts are resolved you will be able to merge the pull request.
Step 1: Checkout the source branch and merge in the changes from the target branch. Resolve conflicts.
git checkout pr-branch git pull origin parent-branch
This is most likely not what you want to do if you have pull.rebase=true configured which we do by default. We would need to add --no-rebase to the git pull command to make it work like we wanted.
Is there a way to customize this UI so we could add --no-rebase? Actually we would rather have it read:
git checkout pr-branch
git fetch origin git merge --no-ff parent-branch
Hey Community! We’re willing to wager that quite a few of you not only use Bitbucket, but administer it too. Our team is excited to share that we’ll be releasing improvements throughout this month of...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events