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

Test merge editor: "Compare with Base" replaces current editor if merge editor isn't pinned #158958

Closed
andreamah opened this issue Aug 23, 2022 · 2 comments · Fixed by #161583
Closed

Test merge editor: "Compare with Base" replaces current editor if merge editor isn't pinned #158958

andreamah opened this issue Aug 23, 2022 · 2 comments · Fixed by #161583
Assignees
@jrieken @hediet
Labels
insiders-released Patch has been released in VS Code Insiders merge-editor under-discussion Issue is under discussion for relevance, priority, approach
Milestone
September 2022

Comments

@andreamah
Copy link
Contributor

Testing #158819

Not sure if this is expected behavior, but viewing the base navigates away from the merge editor, which is a little annoying because looking at the base is probably done just to help with deciding how to merge.
Recording 2022-08-23 at 11 08 18
@hediet hediet added under-discussion Issue is under discussion for relevance, priority, approach merge-editor labels Aug 24, 2022
@hediet hediet added this to the September 2022 milestone Aug 24, 2022
@hediet
Copy link
Member

hediet commented Aug 24, 2022

I think it works as expected. I think when you open the merge editor via SCM it will be sticky (but maybe not).
Maybe it makes sense to make the merge editor sticky once a compare command is invoked.

@bpasero bpasero removed their assignment Aug 25, 2022
@bpasero
Copy link
Member

bpasero commented Aug 25, 2022

I suggest that the explicit user action to open another editor opens it as pinned: true. That way, the original merge editor stays in its original state and the new editor opens next to it.

@jrieken jrieken mentioned this issue Sep 23, 2022
Merged
jrieken added a commit that referenced this issue Sep 23, 2022
@jrieken
pin active editor when comparing with base
0295263 
fixes #158958
jrieken added a commit that referenced this issue Sep 23, 2022
@jrieken
pin active editor when comparing with base (#161583)
4b3835a 
fixes #158958
@vscodenpa vscodenpa added unreleased Patch has not yet been released in VS Code Insiders insiders-released Patch has been released in VS Code Insiders and removed unreleased Patch has not yet been released in VS Code Insiders labels Sep 23, 2022
@github-actions github-actions bot locked and limited conversation to collaborators Nov 7, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@jrieken jrieken

@hediet hediet

Labels
insiders-released Patch has been released in VS Code Insiders merge-editor under-discussion Issue is under discussion for relevance, priority, approach
Projects
None yet
Milestone
September 2022
Development

Successfully merging a pull request may close this issue.

pin active editor when comparing with base microsoft/vscode
6 participants
@bpasero @jrieken @hediet @andreamah @vscodenpa and others