Skip to content

Spurious "This branch has conflicts that must be resolved" warning #1412

@foolip

Description

@foolip
  • Extension version: 0.12.0
  • VSCode Version: 1.39.2
  • OS: Debian 4.19.37

Steps to Reproduce:

  1. Clone the wpt repo and find Let retry.py flush stdout after each log message web-platform-tests/wpt#19754 in the list of pull requests in VS Code. For me it's under "Created By Me" but for others it may be hard to find.
    2.At the bottom of the "Description" view, "This branch has conflicts that must be resolved" will be shown. But there are no conflicts to resolve.

Screenshot:
image

Metadata

Metadata

Assignees

Labels

bugIssue identified by VS Code Team member as probable bugdescription page

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions