Bitbucket Pull Requests: No UI indicator when there are merge conflicts

[Henry Williams]

If there's a merge conflict in a pull request, the UI simply goes blank; there's no indication that the merge failed because there's a conflict.

Version: 1.2 OS: MacOS Mojave 10.14 VS Code: 1.33.1

[Jonathan Doklovic]

@Pramod Busam @Nick Rundquist we could probably do something like this:

https://compknow.com/article/check-conflict-without-merging-git-branch/

[Pramod Busam]

@brainicorn The merge check is tricky because it only works if the destination branch is already checked out and there are no local uncommitted changes. Otherwise it needs user action as we would be changing the state of the repo (switching to a different branch / stashing uncommitted changes etc.).

[Pramod Busam]

Version 1.4.0 of the extension shows conflicted state in pull request files list. Please update and try it out. (Note that you need to update to VS Code 1.34 to use this version)

[Henry Williams]

@pbusam That’s great! I’ll check it out.