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

"Open in Merge Editor" and "Accept Merge" button missing in web #159837

Closed
zWingz opened this issue Sep 2, 2022 · 4 comments · Fixed by #160390
Closed

"Open in Merge Editor" and "Accept Merge" button missing in web #159837

zWingz opened this issue Sep 2, 2022 · 4 comments · Fixed by #160390
Assignees
@jrieken @hediet
Labels
bug Issue identified by VS Code Team member as probable bug candidate Issue identified as probable candidate for fixing in the next release merge-editor verified Verification succeeded
Milestone
August 2022 Recov...

Comments

@zWingz
Copy link
Contributor

zWingz commented Sep 2, 2022 •
edited
Loading

Does this issue occur when all extensions are disabled?: Yes/No

  • VS Code Version: 1.71.0

Steps to Reproduce:

  1. open a codespace
  2. create a merge conflict
  3. open the conflict file

missin the Open in Merge Editor button
image

missin the Accept merge button
image

This is context keys, current file scheme is vscode-remote
image
image

but the git.mergeChange scheme is file
image

so the button is missing because resource in git.mergeChanges is false
image
@zWingz zWingz changed the title "Open in Merge Editor" button missing "Open in Merge Editor" and "Accept Merge" button missing in web Sep 2, 2022
@13ibrahimov
Copy link

I can confirm that "Open in Merge Editor" & "Accept Merge" buttons are missing when VS Code is connected to WSL via Remote - WSL extension.

@chrmarti chrmarti assigned hediet and unassigned chrmarti Sep 7, 2022
@hediet hediet added bug Issue identified by VS Code Team member as probable bug merge-editor labels Sep 7, 2022
@hediet hediet added this to the September 2022 milestone Sep 7, 2022
@jrieken
Copy link
Member

jrieken commented Sep 7, 2022

@zWingz 👏 Thanks for the proper investigation!

@hediet hediet mentioned this issue Sep 7, 2022
Closed
@jrieken jrieken added the candidate Issue identified as probable candidate for fixing in the next release label Sep 8, 2022
@jrieken
Copy link
Member

jrieken commented Sep 8, 2022

Let's make this a 1.70.2 candidate

jrieken added a commit that referenced this issue Sep 8, 2022
@jrieken
send uris for git.mergeChanges context as objects
0ec23c6 
That way they undergo uri transformation and the setContext-command will stringify them so that everything works, fixes #159837
@jrieken jrieken mentioned this issue Sep 8, 2022
Merged
jrieken added a commit that referenced this issue Sep 8, 2022
@jrieken
send uris for git.mergeChanges context as objects (#160390)
ac55912 
That way they undergo uri transformation and the setContext-command will stringify them so that everything works, fixes #159837
@vscodenpa vscodenpa added the unreleased Patch has not yet been released in VS Code Insiders label Sep 8, 2022
@jrieken
Copy link
Member

jrieken commented Sep 8, 2022

Fixed in main but keeping this open to cherry-pick things onto release/1.71

@jrieken jrieken reopened this Sep 8, 2022
@vscodenpa vscodenpa removed the unreleased Patch has not yet been released in VS Code Insiders label Sep 8, 2022
jrieken added a commit that referenced this issue Sep 8, 2022
@jrieken
send uris for git.mergeChanges context as objects
dfc920b 
That way they undergo uri transformation and the setContext-command will stringify them so that everything works, fixes #159837
@jrieken jrieken mentioned this issue Sep 8, 2022
Merged
@jrieken jrieken closed this as completed Sep 14, 2022
@mjbvz mjbvz added the verified Verification succeeded label Sep 14, 2022
@github-actions github-actions bot locked and limited conversation to collaborators Oct 29, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@jrieken jrieken

@hediet hediet

Labels
bug Issue identified by VS Code Team member as probable bug candidate Issue identified as probable candidate for fixing in the next release merge-editor verified Verification succeeded
Projects
None yet
Milestone
August 2022 Recovery 2
Development

Successfully merging a pull request may close this issue.

send uris for git.mergeChanges context as objects microsoft/vscode
7 participants
@jrieken @hediet @chrmarti @mjbvz @zWingz @13ibrahimov @vscodenpa