Search code examples
gitazure-devopsmerge-conflict-resolution

Missing Azure Devops Complete Pull Request button when there are conflicts


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

More actions tool tip

Here are the actions

Complete is disabled

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.


Solution

  • 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

    enter image description here