What I worked in this week:
- No significant code progress in this week , spent the week in design discussions with mentors regarding the conflict resolution UI
- Got a good direction for design but yet to be finalized
Discussion: Conflict resolution: diff engine for notes · Issue #15731 · laurent22/joplin · GitHub
Plan for next week:
- Finalize the project design after discussing with mentors
- make some wireframes based on the agreed design and post in the forum for community feedback
- Resume implementation by starting with completing the word-level diff