Azure Azure DevOps: Resolving 'Conflict Prevents Automatic Merging' A two minute tutorial on how to resolve a pull request merge conflict.
