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

Fix duplicate pickers #735

Merged
merged 10 commits into from
Nov 10, 2023
Merged

Fix duplicate pickers #735

merged 10 commits into from
Nov 10, 2023

Conversation

vidartf
Copy link
Collaborator

@vidartf vidartf commented Nov 10, 2023

To avoid remote, local and merge diff views adding overlapping gutter markers of the same type on the same line. We leave it to CM to handle multiple markers of different types on the same line, but that shouldn't really apply for us.

Fixes #700 .

@vidartf
Copy link
Collaborator Author

vidartf commented Nov 10, 2023

(to have a cleaner diff, exclude the lint commit from the range)

@vidartf vidartf added the bug label Nov 10, 2023
To avoid remote, local and merge diff views adding overlapping gutter markers of the same type on the same line. We leave it to CM to handle multiple markers of different types on the same line, but that shouldn't really apply for us.
@vidartf
Copy link
Collaborator Author

vidartf commented Nov 10, 2023

Hmm... The UI tests shouldn't be passing without a rerender, since the bug is in one of the UI tests, so something went wrong here..

Use simple identity comparison.
@vidartf
Copy link
Collaborator Author

vidartf commented Nov 10, 2023

Bot please update playwright snapshots

Copy link
Contributor

Playwright ubuntu-22.04 snapshots updated.

Copy link
Contributor

Playwright windows-latest snapshots updated.

@vidartf vidartf closed this Nov 10, 2023
@vidartf vidartf reopened this Nov 10, 2023
@krassowski
Copy link
Member

Bot please update playwright snapshots

Copy link
Contributor

Playwright windows-latest snapshots updated.

Copy link
Contributor

Playwright ubuntu-22.04 snapshots updated.

@krassowski krassowski closed this Nov 10, 2023
@krassowski krassowski reopened this Nov 10, 2023
Copy link
Member

@krassowski krassowski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@krassowski krassowski merged commit 2f856da into jupyter:master Nov 10, 2023
15 checks passed
@vidartf vidartf deleted the fix-dup-pickers branch November 10, 2023 23:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CM6: Several conflict gutter markers placed on the same line
2 participants