"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 Thursday in Agile

Managing Projects in Several Jiras at the Same Time

Have you ever noticed that fixing specific problems might be a door opener for a bigger challenge, affecting a wider audience? This was exactly the case when we, as a service company working with mul...

211 views 3 13
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