AgencyHandy MCP v3.0.0 upgrade — accept main branch content for merge conflicts
Decision
Merged main into master with —allow-unrelated-histories, accepting main’s (theirs) version for all 4 conflicted files
Rationale
Main branch had newer v2.0 code (249 tools, Bible v17.1 compliant) vs master’s older code (243 tools, mostly docs). Since the entire codebase was being upgraded to Bible v18.1 anyway, the newer v2.0 foundation was the correct base.
Alternatives Rejected
- Force-push main to master (loses history)\n2. Cherry-pick (complex with no common ancestor)\n3. Keep both branches (violates consolidation)
Outcome
Succeeded. agencyhandy-mcp-god-agent container running and healthy. Merge completed, v3.0.0 operational.
Related
- claude-code-mcp_server_upgrade-20260402-062412
- n8n-god-agent-mcp-rebuild-v5
- n8n-mcp-server-complete-rebuild-vs-incremental-upgrade
- clawteam-openclaw-multi-agent-swarm-evaluation
- enterprise-capability-expansion-5-pillars-from-digital-employee-analysis
- agencyhandy-mcp-v300-upgrade-accept-main-branch-for-merge-co