My pull request has conflicts but I can not find anywhere to resolve them in either DevOps or VS2019
There is More Actions Tool Tip
Here are the actions
CodePudding user response:
You won't be able to resolve merge conflicts directly within Azure DevOps. But you can resolve them with e. g. Visual Studio or using a command line.
This is the documentation you are looking for: Resolve merge conflicts
CodePudding user response:
Move the mouse cursor over the grayed Complete button to see in a popup the reason why the merge cannot be completed.
For instance, in "TFS error: Merge must finish before the Pull Request can be completed", the merge was not finished.
You can abandon it, then reactivate it.