fix: reconcile direct-edit and plain-edit baselines to avoid false conflict dialog#3271
Open
mvanhorn wants to merge 1 commit into
Open
fix: reconcile direct-edit and plain-edit baselines to avoid false conflict dialog#3271mvanhorn wants to merge 1 commit into
mvanhorn wants to merge 1 commit into
Conversation
Up to standards ✅🟢 Issues
|
| Metric | Results |
|---|---|
| Complexity | 4 |
| Duplication | 0 |
NEW Get contextual insights on your PRs based on Codacy's metrics, along with PR and Jira context, without leaving GitHub. Enable AI reviewer
TIP This summary will be updated as you push new changes.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Switching a note between plain edit and rich (direct) edit repeatedly no longer triggers the Text editor's "The document has been changed outside of the editor" conflict dialog when the user made no changes.
Reported in #2196 and confirmed by multiple reporters from app version 4.2.1 (2024) through a fresh reproduction on 2026-06-30. Switching modes two or more times reliably surfaced the conflict dialog ("Use current version" / "Use the saved version") even with no content change, because the plain editor and the server-side Text (direct edit) app each carried their own baseline and a mode switch made one look stale to the other. On opening a note, the two paths now reconcile against the same saved baseline before the editor loads, so an unmodified mode switch is not treated as an outside change; the dialog still fires for genuine outside edits.
Fixes #2196
🖼️ Screenshots
No UI change — this fixes an incorrect conflict dialog that appeared during plain/rich edit mode switches. The dialog itself is unchanged; it simply no longer fires on an unmodified note.
🏁 Checklist
/backport to stable-xx.x🤖 AI (if applicable)