-
Notifications
You must be signed in to change notification settings - Fork 347
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
feat: optimize merge conflict #3585
Conversation
This PR is being deployed to Railway 🚅 core: ◻️ REMOVED |
/next |
🎉 PR Next publish successful!
|
61fb741
to
fec3bd7
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
/next |
🎉 PR Next publish successful!
|
packages/editor/src/browser/merge-editor/MergeEditorFloatComponents.tsx
Outdated
Show resolved
Hide resolved
/next |
🎉 PR Next publish successful!
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Types
Background or solution
CleanShot.2024-04-30.at.15.00.47.mp4
Changelog