update-and-merge

What problem does it solve?

Runneth use-case updates can silently overwrite changes your team intentionally made, or force admins to manually decide what’s safe versus what needs careful review.

Core Features & Use Cases

• Per-file three-way merge with conflict awareness: compares local edits, the installed ancestor version, and the new upstream version to decide what can be updated safely.
• Semantic conflict detection for user.md rules: uses an LLM check to catch cases where an upstream change would override or weaken instructions your team wrote elsewhere in user.md.
• Plan mode for real conflicts: when any part conflicts, nothing is partially updated; instead, a consolidated, human-readable plan is written for admin review and resolution.

Quick Start

Run an update scan on any installed use case and, if a plan appears, reply with your preference for each conflicting file in plain language.