How do I change the "More Information" pop up During a merge conflict? Edited

When receiving a merge conflict on a pull request, the below message appears in the "More Information" pop up. The problem is that it suggests a method that will automatically merge the branches without anyone approving the pull request.

I need to know how to configure this pop up to include instructions on how to resolve the conflicts but still wait for the approval of the reviewers in order to merge

1 answer

Hi, I just registered to tell you I am experiencing the same "issue" at work, although it solved itself. We usually resolve conflicts by pulling the destination branch into the source branch. However, we also got this error for one merge conflict which proposed the other way around (effectively merging manually).