What it does
When two changes touch the same metadata, Serpent's conflict resolver reconciles the routine cases automatically and escalates only what needs a human decision. This keeps merges moving without hiding the conflicts that actually matter.
From your AI client
The resolve_metadata_conflict tool is available over MCP, so Claude,
Cursor, Copilot, or Codex can resolve conflicts directly from your AI client. Every
resolution still flows through Serpent's review and approval before it ships.