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?