Week 3 Progress Update
What I worked on this week:
- Got the migration PR merged and raised the second PR for populating the columns on sync and it's currently under review
Merged PR: All: Resolves #15549: add migration 51 for conflict resolution columns by varunkumar-22 · Pull Request #15565 · laurent22/joplin · GitHub
Second PR: All: Resolves #15570: Populate base and conflict note state during sync by varunkumar-22 · Pull Request #15669 · laurent22/joplin · GitHub - Completed conflict resolution UI navigation setup on Desktop, tested it locally and everything is working as expected
Link: Comparing laurent22:dev...varunkumar-22:feat/conflict-nav-desktop · laurent22/joplin · GitHub - Started section rendering for the conflict resolution UI on Desktop, partially implemented and more work remaining to handle all edge cases carefully
Link: Comparing laurent22:dev...varunkumar-22:feat/conflict-section-rendering · laurent22/joplin · GitHub
Plan for next week:
- Complete section rendering by handling all edge cases
- Enable Use Mine, Use Theirs, Accept and Reject buttons and verify notes are overwritten correctly
- Bulk actions and Finish button