Missing Azure Devops Complete Pull Request button when there are conflicts

Question

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

The docs indicate that VS2019 has some Pull Request features but I cannot see them in Team Explorer or under the Git menu

In VS2019 in the Git Changes tab, working in the fork that the pull request is for, when I pull I get a message that the repository is already up to date.

The Pull Request is from Master of the repository to Master of a fork.

user_13464420 · Answer

In Azure DevOps, there is no built-in feature can resolve the merge conflicts.

But we can use the Extension to achieve this feature in Azure DevOps: Pull Request Merge Conflict Extension

user_1163423 · Answer

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

VonC_6309 · Answer

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.

Missing Azure Devops Complete Pull Request button when there are conflicts

3 Answers