GSoC Week 1 Update - Sync Conflict Resolution
Week 1 is done. Here's what I got through:
- Database migration adding the required fields for the project .PR is open and under review:
https://github.com/laurent22/joplin/pull/15565 - Sync pipeline changes to populate the relevant fields when a sync or conflict occurs. implementation and testing complete, waiting on the migration PR to merge before raising this one: https://github.com/laurent22/joplin/compare/dev...varunkumar-22:feat/sync-base-fields?expand=1
- Risk assessment updates after discussion with my mentor CalebJohn, still being finalized
For Week 2, I'm planning to:
- Write integration tests for the sync pipeline changes
- Implement the merge-diff engine
- Test end-to-end diffing with real conflict data from the new sync flow