-1

It seems like I am facing a bug within my Azure Devops repository. Within my pull request I have merge conflicts. Every time I solve these and resolve the matching comment, a new merge conflict appears.

Here you can see I resolved all the issues:

Next when I return to the overview page a new merge conflict is shown:

When I solve this and go back to the overview page a new merge conflict is shown.

This keeps on happening.

jonrsharpe
  • 115,751
  • 26
  • 228
  • 437
Jeroen van den Raadt
  • 1

1 Answers1

0

It is not a bug in Azure DevOps but Way of Working.

Every conflict when manually resolved from the AzureDevops Conflicts tab, will have a comment created. Before completing the PR approval, the peer reviewer needs to resolve this comment related to the conflict resolution.

koushik
  • 320
  • 6
  • 14
  • Hi, the problem is that every time all the conflicts are accepted and the comments resolved new conflicts pop up. I turned off that I need a peer reviewer. – Jeroen van den Raadt Jun 28 '21 at 06:17
  • I would check if there is already another app or a person making changes on that that file in the `main` branch – koushik Jun 29 '21 at 07:06