Skip to content

All: Fixes #13531: When creating a conflict, ensure the latest note contents are used to create the conflict #13552

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.

Sign up for GitHub

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

Merged
laurent22 merged 6 commits into from
Nov 3, 2025
Merged

All: Fixes #13531: When creating a conflict, ensure the latest note contents are used to create the conflict #13552

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6014671
When creating a conflict, ensure the latest note contents are used to…
mrjo118 Oct 27, 2025
d81d980
Add test
mrjo118 Oct 30, 2025
70422f0
Update test to cover the required scenario
mrjo118 Oct 30, 2025
043d916
Add additional test
mrjo118 Oct 30, 2025
d548584
Test fix and improvements
mrjo118 Oct 30, 2025
8878434
Update comment
mrjo118 Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/lib/services/synchronizer/utils/handleConflictAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ export default async (action: SyncAction, ItemClass: typeof BaseItem, remoteExis
});
}
} else if (action === SyncAction.NoteConflict) {
// Reload the note, to ensure the latest version is used to create the conflict
local = await Note.load(local.id);
Copy link
Owner

@laurent22 laurent22 Oct 29, 2025

Choose a reason for hiding this comment

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

I guess it would be difficult to add a test for this?

Copy link
Contributor Author

@mrjo118 mrjo118 Oct 30, 2025

Choose a reason for hiding this comment

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

Test now added


// ------------------------------------------------------------------------------
// First find out if the conflict matters. For example, if the conflict is on the title or body
// we want to preserve all the changes. If it's on todo_completed it doesn't really matter
Expand Down