How to resolve merge conflict in pull request in VSTS?

Question

I've created pull request I got into this:

"Approve" button does nothing and complete is disabled.

How do I resolve this conflict in the pull request?

Answer 1

I hope this helps: click here

For difficult situations, you can do either one of them:

1. Resolve the conflict, reverse-integrate the changes from the target branch which will create additional merge commits 

2. Rebase on the target branch that will give you a clean history

Here is a plugin that will help: click