What I worked on this week:
- Second PR for populating the new sync fields got merged
link: Chore: Desktop, Mobile: Resolves #15570: Populate base and conflict note state during sync by varunkumar-22 · Pull Request #15669 · laurent22/joplin · GitHub - Raised and merged a follow-up migration PR to add a numeric primary key to the
conflict_note_statestable and keepnote_idas unique
link: Mobile, Desktop, Cli: Resolves #15722: Give conflict_note_states table a numeric primary key and set note_id as unique by varunkumar-22 · Pull Request #15724 · laurent22/joplin · GitHub - Continued working on section rendering in the conflict resolution UI and hit some edge cases around diff and opened a discussion on it
- Opened a discussion on the
diffNotesPR regarding word level diff implementation and it is still being discussed with mentors
link: Conflict resolution: diff engine for notes · Issue #15731 · laurent22/joplin · GitHub
Plan for next week:
- Finalize section rendering after mentor input on edge cases
- Move forward on word-level diff approach once discussion finishes
- Complete action buttons : Accept/Reject, Use Mine/Use Theirs, Edit Manually