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?
...steemed Steve Elliot (head of product for Jira Align). Agenda: What’s new or changed in SAFe 5.0: Introduction of OKRs Essential SAFe How to achieve true business a...
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