Use codemirror merge addon to replace mis-merge [INS-1425] #9268
Conversation
This file contains hidden or 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
|
cool |
yaoweiprc
force-pushed
the
fix/merge-editor
branch
2 times, most recently
from
a5e1c5f to
bd7e758
Compare
yaoweiprc
force-pushed
the
fix/merge-editor
branch
from
b4385ec to
3c55660
Compare
yaoweiprc
force-pushed
the
fix/merge-editor
branch
from
3c55660 to
3b47406
Compare
CurryYangxx
approved these changes
Oct 24, 2025
|
LGTM |
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.
I used the MisMerge library as the merge editor. This library enables our current three-column diff view and highlights each conflicting change. When rendering the relationships between conflicting blocks at a low level, the library uses a canvas to draw graphics. For files with a large number of lines, the canvas area becomes very large, which can cause the rendering process to crash. As a result, the app becomes unresponsive
I changed to go with this new approach. It’s based on CodeMirror 5’s merge addon, with interactions similar to Mismerge, but the performance is significantly better.