Frequently getting all conflicts have been resolved after clicking Resolve conflicts

[Tyriar]

Testing #5939

microsoft/vscode#195255

Can we merge this diff automatically but only do it when requested, and .com can't?

---

Another example:

microsoft/vscode#195255

[alexr00]

This is the 300 file limit. New behavior will be to show this error dialog (and it will be faster):

[andreamah]

@Tyriar is this still happening for you?

[alexr00]

Anyone can verify this by opening one of the examples in the OP in insiders.vscode.dev:

• Make sure you have the pre-release version of the extension installed
• Set "githubPullRequests.experimentalUpdateBranchWithGitHub": true
• Open the PR description and scroll down to click on the "resolve conflicts" button
• Verify that a message shows saying that this conflict can't be resolved here.