AgencyHandy MCP v3.0.0 upgrade — accept main branch for merge conflicts
Decision
Merged main into master with —allow-unrelated-histories, accepting main (theirs) version for all 4 conflicted files
Rationale
Main branch had newer v2.0 code (249 tools) vs master’s older code (243 tools). The entire codebase was being upgraded to Bible v18.1, so newer foundation was correct.
Alternatives Rejected
Outcome
Succeeded. Duplicate of canonical decision (agencyhandy-mcp-v300-upgrade-accept-main-branch-content-for). Both recorded same merge event on 2026-04-02. Container running.
Related
- agencyhandy-mcp-v300-upgrade-accept-main-branch-content-for
- claude-code-mcp_server_upgrade-20260402-062412
- clawteam-openclaw-multi-agent-swarm-evaluation
- n8n-god-agent-mcp-rebuild-v5
- n8n-mcp-server-complete-rebuild-vs-incremental-upgrade