Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

"Automatic merge failure", but no file conflicts listed on BitBucket 5.2

Our team has two release branches 2.0 and 2.1 with any PRs merged into 2.0 automatically merged into 2.1.

Recently, we merged a PR into 2.0 that triggered an "Automatic merge failure", but we visit the auto-created PR, it says "There are no changes" under the Diff tab (see attached).

How does one resolve resolve this "Conflict"? How/why did it happen?AutoMergeFail_NoFileConflictsListed.PNG

0 answers

Suggest an answer

Log in or Sign up to answer
Community showcase
Published in Team Playbook

Atlympic Event: Team Playbook

Hello Community!  Quick disclaimer: We are running a contest on Community (The Atlympics!) from July 23rd - August 8th of 2021. If you are interested in participating in this contest (prizes! ...

55 views 0 6
Read article

Community Events

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

Events near you