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

Provide 3-pane layout where "Local" and "Remote" are shown w/o diffs? #9

Open
eacousineau opened this issue Nov 24, 2021 · 0 comments
Assignees
Labels
enhancement New feature or request

Comments

@eacousineau
Copy link
Contributor

eacousineau commented Nov 24, 2021

Which problem is your feature request related to, if any?

Layouts

Solution you'd like

An extra layout option, if possible; similar to 3DiffTo* flavors, but only show diff in one pane ("Merged"), and base changes in other ("Local", "Remote").

Perhaps named 3LocalMergedRemote?

From looking at code, I think it'd be something like changing this to use type: LayoutElementType.normalEditor?

groups: [
{
size: leftSize,
type: LayoutElementType.diffEditor,
oldUri: diffedURIs.base,
newUri: diffedURIs.local,
title: "(1) Current changes on base",
save: false,
notFocussable: zoom === Zoom.right,
},

Description of alternatives you've considered

I've briefly tried out existing 3DiffTo* layouts, but get confused when all panes show diffs.

Additional context

I believe this is similar to how Meld works.

@eacousineau eacousineau added the enhancement New feature or request label Nov 24, 2021
@eacousineau eacousineau changed the title Provide 3-pane layout where "Local" and "Remote" are shown w/o edits? Provide 3-pane layout where "Local" and "Remote" are shown w/o diffs? Nov 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

No branches or pull requests

2 participants