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

Merge editor should offer action to open regular file #153690

Closed
isidorn opened this issue Jun 29, 2022 · 3 comments · Fixed by #155159
Closed

Merge editor should offer action to open regular file #153690

isidorn opened this issue Jun 29, 2022 · 3 comments · Fixed by #155159
Assignees
@jrieken @hediet
Labels
feature-request Request for new features or functionality insiders-released Patch has been released in VS Code Insiders merge-editor polish Cleanup and polish issue verification-needed Verification of issue is requested verified Verification succeeded
Milestone
July 2022

Comments

@isidorn
Copy link
Contributor

isidorn commented Jun 29, 2022

Same as when opening a diff editor, a merge editor should offer a way to open the regular file (not in 3 way merge mode).
Same as diff editor it could use an action in the editor title area

Screenshot 2022-06-29 at 15 31 15
@hediet hediet assigned jrieken and hediet and unassigned hediet Jun 29, 2022
@hediet hediet added this to the June 2022 milestone Jun 29, 2022
@hediet hediet added the polish Cleanup and polish issue label Jun 29, 2022
@jrieken jrieken modified the milestones: June 2022, July 2022 Jun 29, 2022
@jrieken
Copy link
Member

jrieken commented Jun 29, 2022

Let's move this to July

@jrieken jrieken added the feature-request Request for new features or functionality label Jul 14, 2022
@jrieken jrieken mentioned this issue Jul 14, 2022
Merged
jrieken added a commit that referenced this issue Jul 14, 2022
@jrieken
add 'Open File' command to merge editor title bar
9c0cb72 
fixes #153690
jrieken added a commit that referenced this issue Jul 14, 2022
@jrieken
add 'Open File' command to merge editor title bar (#155159)
c12daa6 
fixes #153690
@vscodenpa vscodenpa added the unreleased Patch has not yet been released in VS Code Insiders label Jul 14, 2022
andreamah pushed a commit that referenced this issue Jul 14, 2022
@jrieken @andreamah
add 'Open File' command to merge editor title bar (#155159)
dd3ef10 
fixes #153690
@vscodenpa vscodenpa added insiders-released Patch has been released in VS Code Insiders and removed unreleased Patch has not yet been released in VS Code Insiders labels Jul 15, 2022
jrieken added a commit that referenced this issue Jul 18, 2022
@jrieken
add 'Open File' command to merge editor title bar (#155159)
d2eeaf6 
fixes #153690
@jrieken jrieken added the verification-needed Verification of issue is requested label Jul 21, 2022
@jrieken
Copy link
Member

jrieken commented Jul 21, 2022

To verify:

  • open a merge editor
  • verify its title bar has a command to open the result file

@bpasero bpasero added the verified Verification succeeded label Jul 26, 2022
@bpasero
Copy link
Member

bpasero commented Jul 26, 2022

I wonder if "Open Changes" button should go back to the merge editor then?

image

@github-actions github-actions bot locked and limited conversation to collaborators Aug 28, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@jrieken jrieken

@hediet hediet

Labels
feature-request Request for new features or functionality insiders-released Patch has been released in VS Code Insiders merge-editor polish Cleanup and polish issue verification-needed Verification of issue is requested verified Verification succeeded
Projects
None yet
Milestone
July 2022
Development

Successfully merging a pull request may close this issue.

add 'Open File' command to merge editor title bar microsoft/vscode
5 participants
@bpasero @jrieken @isidorn @hediet @vscodenpa