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.

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

Merge editor: integrate the editable result editor like a normal text editor #150870

Closed
bpasero opened this issue May 31, 2022 · 2 comments
Closed

Comments

@bpasero
Copy link
Member

bpasero commented May 31, 2022

Testing #150389

A diff editor today when you open it behaves in many ways like a normal text editor, for example:

Maybe we should split this issue up into individual things, there is probably not a single fix for all these items, but bringing up for discussion.

@jrieken
Copy link
Member

jrieken commented Jun 7, 2022

I believe most points of this issue are because of the disablement of editor contributions

you can close a dirty diff editor without being asked to save provided that the file is opened in a normal editor somewhere else

This is valid but I believe only works because the workbench has deep knowledge about the concept of side-by-side editors. I was wondering if the merge editor should be side-by-side of side-by-side to get this working properly. Let's discuss offline

@bpasero bpasero self-assigned this Jun 12, 2022
@jrieken
Copy link
Member

jrieken commented Jun 24, 2022

Closing this in favour of #150868 and #151024

@jrieken jrieken closed this as completed Jun 24, 2022
@jrieken jrieken removed the feature-request Request for new features or functionality label Jun 24, 2022
@github-actions github-actions bot locked and limited conversation to collaborators Aug 9, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

No branches or pull requests

3 participants