Forums

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

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

Robert Wojack
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
November 13, 2017

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
TAGS
AUG Leaders

Atlassian Community Events