AgentSCM - Catch agent merge conflicts at edit time, not merge time.

Today we're soft-launching the alpha version of AgentSCM for preview and testing. Sub-agents and...