Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Closed
foolip opened this issue Oct 25, 2019 · 3 comments · Fixed by #1427
Closed

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

foolip opened this issue Oct 25, 2019 · 3 comments · Fixed by #1427
Assignees
@JacksonKearl
Labels
bug Issue identified by VS Code Team member as probable bug description page

Comments

@foolip
Copy link

foolip commented Oct 25, 2019

  • 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
@foolip foolip mentioned this issue Oct 25, 2019
Closed
@foolip
Copy link
Author

foolip commented Oct 25, 2019

If it'll help to debug this issue, at the time I was looking the refs/pull/19754/merge ref of the repo was pointing at web-platform-tests/wpt@4c234ad. The first parent of that merge is web-platform-tests/wpt@b482734 (the master branch) and the second is web-platform-tests/wpt@3cb58e9 (head of the PR branch). No conflict.

@RMacfarlane RMacfarlane added bug Issue identified by VS Code Team member as probable bug description page labels Oct 25, 2019
@RMacfarlane
Copy link
Contributor

Thanks for reporting this @foolip! Looks like we are missing a "pending" state for this message - should display that the mergability is still being calculated in that case

@foolip
Copy link
Author

foolip commented Oct 25, 2019

Aha, that would explain it. I had just created the PR then.

@JacksonKearl JacksonKearl self-assigned this Oct 28, 2019
@JacksonKearl JacksonKearl mentioned this issue Oct 30, 2019
Merged
RMacfarlane pushed a commit that referenced this issue Oct 31, 2019
Provide "pending" mergeability state, wherein updates are polled, fixes
1be7acd 
#1412
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@JacksonKearl JacksonKearl

Labels
bug Issue identified by VS Code Team member as probable bug description page
Projects
None yet
Milestone
No milestone
3 participants
@foolip @RMacfarlane @JacksonKearl