Conflict resolution in web reader

[mohith-das]

Summary

Resolve git merge conflicts in the web reader UI instead of requiring command-line git.

Motivation

When a user edits in Obsidian and the AI writes at the same time, conflicts can occur on push. Currently users must resolve them via git pull + manual merge. A web UI would make this accessible to non-technical users.

Approach

• Detect conflicts on push failure
• Show conflicting pages in the web reader with both versions side by side
• User picks which version to keep (or edits a merged version)
• Commit the resolution