vscode-pull-request-github icon indicating copy to clipboard operation
vscode-pull-request-github copied to clipboard

Published 20 hours ago • verified publisher icon microsoft

Pull request description page does not show resolve conflict action when checkout branch and current branch are same

Open deepak1556 opened this issue 1 year ago • 2 comments

Testing #5648

  • Check out branch locally to the one that has conflicts
  • In the PR view, see the action to check out pull request
  • Nothing happens as the expected branch and current branch are same
  • I would expect the checkout action to work or the pull request description should be updated

https://github.com/microsoft/vscode-pull-request-github/assets/964386/eeac5371-2a47-44dd-89b0-990d2db3cb68

deepak1556 avatar Jan 24 '24 05:01 deepak1556

It seems we're not associating the current branch with that PR. Can you share the output from GitHub Pull Request and from Git?

alexr00 avatar Jan 24 '24 08:01 alexr00

Screenshot_2024-05-19-23-02-05-289_com mi globalbrowser

Aslan11021983 avatar May 19 '24 20:05 Aslan11021983