ateam_github_sync_from_main

io.github.ariekogan/ateam-mcp · Verify this server

BRING `dev` UP TO DATE WITH `main` — merges main into dev. The mirror of ateam_github_promote. USE THIS WHEN PROMOTE RETURNS 409. promote only ships dev→main, so the moment anything lands on main directly — a hotfix, a manual edit, an ateam_github_rollback, or a write that mis-targeted the branch — dev falls behind and can never be promoted again. Without this tool that divergence is unfixable from A-Team: the only exits are the GitHub web UI or a raw API call. Workflow on a 409: 1) ateam_github_diff (confirm status:'diverged') → 2) ateam_github_sync_from_main → 3) ateam_github_promote. Pass dry_run:true FIRST to see exactly which commits and files would come into dev without changing anything. This is a real merge, not a force: if main and dev edited the SAME lines it returns 409 too, and that one genuinely needs a human (open a PR).