Forums

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

Customize Pull Request Merge Conflict user interface?

Eric Pederson
Contributor
November 3, 2020

When Bitbucket recognizes that you would have a conflict if you merged your PR branch it displays a UI like:

Merge conflict

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

 

0 answers

Suggest an answer

Log in or Sign up to answer
DEPLOYMENT TYPE
SERVER
TAGS
atlassian, atlassian community, job interviews, interview tips, career advice, interview preparation, job search, interview experiences, hiring process, atlassian careers, community discussion, interview best practices

Interview Tips & Pet Peeves ✍️

Join the discussion on interview best practices and common pitfalls. Share your experiences and learn from others in the Atlassian Community.

Share you experiences!
AUG Leaders

Atlassian Community Events