1. Atlassian Labs Avatar Atlassian Labs
  2. Partner Integrations
  3. atlascode
  4. Issues

Merge conflicts don't appear in PRs

Issue #94 resolved
Former user created an issue

When a merge conflict exist on code, it shows in the web ui but not the VSCode extension.

Comments (2)

  1. Former user Account Deleted reporter
    • edited description

    When a merge conflict exist on code, it shows in the web ui bt not the VSCode extension.

  2. Pramod Busam Account Deactivated

    @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.

  3. Log in to comment
Assignee
–
Type
bug
Priority
major
Status
resolved
Component
–
Votes
1
Watchers
2