- edited description
Merge conflicts don't appear in PRs
Issue #94
resolved
When a merge conflict exist on code, it shows in the web ui but not the VSCode extension.
Comments (2)
-
Account Deleted reporter -
Account Deactivated - changed status to resolved
@danquackenbush Version 1.4.0 of the extension shows the conflicted state of a file in the pull request files view on the sidebar. Please update and try it out. (Note that you need to update to VS Code 1.34 to use this version)
It does not show up in the diff view yet but we are looking into if it is feasible or not based on VS Code's APIs.
- Log in to comment
When a merge conflict exist on code, it shows in the web ui bt not the VSCode extension.