conflicts

Detects and resolves pending Git conflicts from the inter‑PC auto-sync system. Reads the marker `.conflicts-pending.yaml`, analyzes the two backup versions (ours/theirs) in plain human language per file, identifies the nature of each divergence (different additions, edits in the same section, deletion vs keep), proposes clear A/B/C options with a motivated recommendation (caveman OFF), executes the chosen resolution after validation by Florent, then cleans up the marker. Triggers: "/conflicts", "resolve conflicts", "git conflicts", "there's a conflict", "fix conflict". Automatically invoked as soon as the reminder "⚠️ N Git conflicts pending" injected by the UserPromptSubmit hook appears.