We have a PR release process (classic) that runs tests and posts a status when it completes. PRs without conflicts are completing and merging in successfully, but PRs with conflicts are failing to merge since last week.
After resolving conflicts and the PR release starts, it will run through and a green tick will eventually be shown on the PR page. When we go to complete the changes, DevOps detects some kind of change and reverts the posted status.
The below messages appear when trying to complete (nobody has again tried to resolve conflicts): conflict message
It seems there's something DevOps doesn't like when it tries to merge but I can't figure out what it is.
We have tried:
- Merging the pull request branch against the target on my local machine - all is OK, no errors raised.
- Turning this setting off and it works: repo setting but we want to keep this on.
We could also rebase but we would rather not have to enforce this.
