(Replace this first paragraph with a brief description of your new category. This guidance will appear in the category selection area, so try to keep it below 200 characters.)
Use the following paragraphs for a longer description, or to establish category guidelines or rules:
Why should people use this category? What is it for?
How exactly is this different than the other categories we already have?
What should topics in this category generally contain?
Do we need this category? Can we merge with another category, or subcategory?
This Category is for GSoC 2026 project adding an Interactive sync conflict resolution UI to Joplin desktop and mobile
Longer description:
This category is for tracking progress, discussions and updates related to the GSoC 2026 Sync Conflict Resolution project.
Currently when the same note is edited on two devices while offline, Joplin saves the local version as a conflict note and overwrites it with the remote version. The user has to open both notes manually and figure out what to keep. This project replaces that experience with an interactive resolution UI that shows exactly what each side changed, section by section, and lets the user resolve each difference before merging the result back into the original note.
Topics in this category will cover weekly progress updates, implementation decisions, PR links for review, open questions and edge cases as they come up during coding.
This category is separate from the general Development category because the conflict resolution feature touches the sync pipeline, database schema and note editor in ways that benefit from a dedicated space for focused discussion rather than getting lost in general threads.