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?
I’m Jess, a Product Marketer for Jira Software Server and Data Center, and now a huge fan of our products. Read on for a 90 day, new-hire perspective on what it’s like to standardize on the Atlassian...
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!
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