Home > Mobile >  Missing Azure Devops Complete Pull Request button when there are conflicts
Missing Azure Devops Complete Pull Request button when there are conflicts

Time:09-16

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

enter image description here

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.

  • Related