Closed
Description
We show "resolve conflicts" button on the PR description when the PR is checked out and there are conflicts, but there's no option do resolve conflicts when the PR is not checked out. This also applies to vscode.dev, where we don't have the git extension's merge API.