Skip to content

All: Fixes #11902: Ensure notebook conflicts do not delete child notes and notebooks when resolved #13167

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 10 commits into from
Oct 9, 2025
Merged

All: Fixes #11902: Ensure notebook conflicts do not delete child notes and notebooks when resolved #13167

Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
73e840d
Ensure notebook conflicts do not delete child notes and notebooks whe…
mrjo118 Sep 9, 2025
d9bcfaa
Rerun pipeline
mrjo118 Sep 9, 2025
7ae8fa3
Merge branch 'dev' into ensure-non-note-conflicts-do-not-delete-children
mrjo118 Sep 9, 2025
f9f527b
Add comment
mrjo118 Sep 13, 2025
0f39614
Merge branch 'dev' into ensure-non-note-conflicts-do-not-delete-children
mrjo118 Sep 13, 2025
7926a7b
Update handleConflictAction.ts
laurent22 Sep 30, 2025
ce0cb3e
Merge remote-tracking branch 'origin/dev' into ensure-non-note-confli…
mrjo118 Sep 30, 2025
9f0c5b7
Update test
mrjo118 Sep 30, 2025
2e50089
Merge branch 'dev' into ensure-non-note-conflicts-do-not-delete-children
mrjo118 Sep 30, 2025
faa8982
Include direct child of deleted folder in test
mrjo118 Oct 2, 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
1 change: 1 addition & 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 @@ -33,6 +33,7 @@ export default async (action: SyncAction, ItemClass: typeof BaseItem, remoteExis
changeSource: ItemChange.SOURCE_SYNC,
sourceDescription: 'sync: handleConflictAction: non-note conflict',
trackDeleted: false,
deleteChildren: false,
Copy link
Owner

@laurent22 laurent22 Sep 13, 2025

Choose a reason for hiding this comment

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

I think that may be unexpected next time someone looks at this code. Could you please add a short comment above it?

Copy link
Contributor Author

@mrjo118 mrjo118 Sep 13, 2025

Choose a reason for hiding this comment

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

Done

});
}
} else if (action === SyncAction.NoteConflict) {
Expand Down