1

Using Azure DevOps, I submitted a Pull Request. The OverView says there are merge conflicts, but offers no way to edit/resolve them. The View merge changes item on the "three dots" menu is greyed out.

Any ideas as to why the PR is presenting this way and/or what I can do?

Michael
  • 1,351
  • 1
  • 11
  • 25
  • General answer for graphical webhosts of repos (read GitHub). Your conflict(s) are likely too complicated to be displayed in their GUI. You might have to checkout and pull this branch in a terminal command line and solve the conflicts there. – TheIceBear Jun 23 '22 at 11:19
  • Do you have the Pull Request Merge Conflict Extension (https://marketplace.visualstudio.com/items?itemName=ms-devlabs.conflicts-tab) installed? It provides a way of resolving conflicts from within the pull request (c.f. https://stackoverflow.com/questions/63473042/azure-devops-resolve-pull-request-conflict or https://stackoverflow.com/questions/64722185/how-do-i-resolve-a-pull-request-merge-conflict-in-azure-dev-ops) – Andrew McClement Jun 23 '22 at 11:57
  • https://stackoverflow.com/questions/71871488/not-able-to-resolve-conflict-in-azure-devops/71875723#71875723 – Shayki Abramczyk Jun 23 '22 at 12:25

1 Answers1

2

Install this extension from Marketplace.

enter image description here

You could check the Conflicts tab in the Pull Request Page.

enter image description here

enter image description here

Kim Xu-MSFT
  • 1,819
  • 1
  • 2
  • 4