How do I change the "More Information" pop up During a merge conflict? Edited

When receiving a merge conflict on a pull request, the below message appears in the "More Information" pop up. The problem is that it suggests a method that will automatically merge the branches without anyone approving the pull request.

I need to know how to configure this pop up to include instructions on how to resolve the conflicts but still wait for the approval of the reviewers in order to merge

 

Merge conflict

Close

This pull request has conflicts.

You must resolve the conflicts by manually merging this branch into test. This will merge the pull request remotely.

Step 1: Checkout the target branch and merge in the changes from the source branch. Resolve conflicts.

git checkout test
git pull origin feature/BRANCH-some-process

Step 2: After the merge conflicts are resolved, stage the changes accordingly, commit the changes and push.

git commit
git push origin HEAD

Step 3: The pull request will be updated and marked as merged.

1 answer

0 vote

Hi, I just registered to tell you I am experiencing the same "issue" at work, although it solved itself. We usually resolve conflicts by pulling the destination branch into the source branch. However, we also got this error for one merge conflict which proposed the other way around (effectively merging manually).

What shocked me that googling the mesage for exact matches only returns this very page: https://www.google.com/search?q=%22You+must+resolve+the+conflicts+by+manually+merging+this+branch+into%22

So, is there any reason why Bitbucket proposes 99% of the times to do a dest->source merge (so we can merge with the button in the PR), but now it proposes the other way around?

@Kogan Moonsamy have you tried to merge dest->source and see if that resolved the issue (instead of following the steps to merge source->dest)?

Suggest an answer

Log in or Join to answer
Community showcase
Piotr Plewa
Published Dec 27, 2017 in Bitbucket

Recipe: Deploying AWS Lambda functions with Bitbucket Pipelines

Bitbucket Pipelines helps me manage and automate a number of serverless deployments to AWS Lambda and this is how I do it. I'm building Node.js Lambda functions using node-lambda&nbsp...

705 views 0 4
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot