Better conflict resolution workflow (CLI + web UI)

[Alphanymous]

Summary

find_conflicts surfaces conflicts but resolution is currently manual. We need a first-class workflow that lets users resolve conflicts directly from the CLI (and optionally from the web UI).

Proposed Changes

CLI

# List unresolved conflicts
ele conflicts list

# Choose one side
ele resolve-conflict <id> --choose source=claude
ele resolve-conflict <id> --choose source=obsidian

# Interactive merge (opens $EDITOR with both versions + merge markers)
ele resolve-conflict <id> --interactive

# Auto-resolve by strategy
ele resolve-conflict --all --strategy=newest
ele resolve-conflict --all --strategy=longest

Web UI

• Add a Conflicts tab/badge in the dashboard showing unresolved count
• Side-by-side diff view for each conflict pair
• One-click "Keep this / Keep that / Merge" buttons
• Option to write a merged version inline

Acceptance Criteria

• ele conflicts list shows all pending conflicts with IDs
• ele resolve-conflict <id> --choose source=<name> resolves and marks as done
• ele resolve-conflict <id> --interactive opens a merge editor
• Web UI shows conflicts and allows resolution
• Resolved conflicts are recorded so find_conflicts no longer surfaces them

Related

Builds on existing find_conflicts logic.