Azure DevOps: Resolving 'Conflict Prevents Automatic Merging'

A two minute tutorial on how to resolve a pull request merge conflict.

Azure DevOps: Resolving 'Conflict Prevents Automatic Merging'

Are you new to the pull request process? Have you run into either of these messages?

conflict prevents automatic merging
conflicts badge

Watch my two minute tutorial on how to resolve these merge conflicts. It's much easier than you think!