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.

Your pull can tell you that you are up to date doesn't mean that you are 'synced' with the target branch. So check that you have rebased or merged (depending on your strategy) your branch with the target branch. This action must raise conflicts that you will have to solve. And after don't forget to push. — Philippe, Sep 14 '21 at 07:04

Kevin Lu-MSFT · Accepted Answer · 2021-09-14T06:52:44.510

2

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

edited Sep 14 '21 at 06:52

answered Sep 14 '21 at 06:46

Kevin Lu-MSFT

20,786
3
19
28

Oh dear, I don't really want to install an experiment. – Kirsten Sep 14 '21 at 07:04
understand. But in this case, this extension may make this issue easier to alleviate. Just a suggestion/option – Kevin Lu-MSFT Sep 14 '21 at 07:10
1

Thanks Kevin. I got brave and tried it successfully! – Kirsten Sep 14 '21 at 10:48

score 1 · Answer 2 · answered Sep 14 '21 at 06:27

1

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

answered Sep 14 '21 at 06:27

Martin Brandl

56,134
13
133
172

I updated the question to show that VS has no knowledge of the pull request. – Kirsten Sep 14 '21 at 06:47

score 1 · Answer 3 · answered Sep 14 '21 at 06:29

1

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.

answered Sep 14 '21 at 06:29

VonC

1,262,500
529
4,410
5,250

Abandoning and Reactivating leaves me in the same situation – Kirsten Sep 14 '21 at 06:51
@Kirsten And what the tooltip above "Complete" says in your case? – VonC Sep 14 '21 at 06:52
@Kirsten I understand the arrow tooltip says "More Action". Does that mean there is no tooltip on the "complete" button itself? – VonC Sep 14 '21 at 06:57
Thanks, I updated the project to show the tool tip simply says "More Actions" – Kirsten Sep 14 '21 at 06:58
The complete button itself has no tooltip. – Kirsten Sep 14 '21 at 06:59

Missing Azure Devops Complete Pull Request button when there are conflicts

3 Answers3