its possible to resolve conflicts when opening the pr in vscode from bitbucket

hugo barajas

 

hello, i have made a pull request from bitbucket, only that conflicts appear, i clicked on the functionality of viewing the pr in VsCode, but it only allows me to view it, is there a way to resolve the conflicts there

Theodora Boudale

Hi Hugo and welcome to the community!

Are you using Bitbucket Cloud with Atlassian for VS Code extension?

If so, I'm afraid that it is not possible to resolve merge conflicts with this extension.

You can check the following documentation for info on how to resolve conflicts from a command line application:

• https://support.atlassian.com/bitbucket-cloud/docs/resolve-merge-conflicts/

Kind regards,
Theodora