Support hiding base editor #699
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fcollonval
force-pushed
the
fix/682-Support-merge-view-with-3-panels-theirs-|-final-|-ours-in-addition-to-the-current-4-panels-views
branch
from
c44091e to
7a07f1a
Compare
|
bot please update playwright snapshots |
|
@fcollonval Thanks for the PR and adding ui-tests for the 3 way merge view. In the 3 panels view ui-test, it seems that the expected number of picker markers symbols should be 26 instead of the 25 given number. |
|
It seems that the padding is missing in the central merge editor when the padding is at the end of the editor (as shown in example5 here below): |
|
bot please update playwright snapshots |
…to the current 4 panels views Fixes jupyter#682
fcollonval
force-pushed
the
fix/682-Support-merge-view-with-3-panels-theirs-|-final-|-ours-in-addition-to-the-current-4-panels-views
branch
from
a8e24bc to
3fc3e4e
Compare
|
bot please update playwright snapshots |
1 similar comment
|
bot please update playwright snapshots |
|
Playwright ubuntu-22.04 snapshots updated. |
|
bot please update playwright snapshots |
|
Playwright ubuntu-22.04 snapshots updated. |
fcollonval
deleted the
fix/682-Support-merge-view-with-3-panels-theirs-|-final-|-ours-in-addition-to-the-current-4-panels-views
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #682
It adds a new CLI option
--no-baseto switch from a 4-panels to a 3-panels merge view.TODO