[lawrencecchen]

Summary

This adds a section to docs/ci/merge-main.md: what to do when git is older than 2.46. The merge-main resolver needs attr.tree (git 2.46), and the Linux agent VMs have git 2.43, so scripts/merge-main.sh stops there. The lead agreed that a plain git merge of the base meets the intent of the rule.

The fallback has these limits:

• Use it only on a branch whose head you trust.
• Make a merge commit only: no rebase and no force push.
• Never merge a generated file by hand.
• Run the checks of the area before you push.
• Get a new receipt at the merge head, because next-autoland carries a receipt only across a cmux-bot base merge.

This is the path #33161 took, with the reviewer's confirmation at its merge head.

Observed / Not run

Docs only. prepush-gate.py is clean. Nothing else was run.

Changelog

none

---

^{Open in [code]smith · Need help on this PR? Tag @codesmith-bot with what you need.}

---

Summary by cubic

Adds a section to docs/ci/merge-main.md covering the fallback when git is older than 2.46, which the merge-main resolver requires (attr.tree). The Linux agent VMs ship git 2.43, so scripts/merge-main.sh stops there, and a plain git merge of the base now meets the rule's intent.

The fallback applies only to trusted branches, permits merge commits only (no rebase, squash, or force push), and requires regenerating generated files rather than hand-merging them. On main, merge the last green commit that --dry-run reports, not the tip, and confirm the trusted merge drivers are present, installing them via scripts/install-git-hooks.sh if not. It also mandates running the area's checks before pushing and getting a new receipt at the merge head, since next-autoland carries receipts only across its own cmux-bot base merges.

^{Written for commit dca0b5f. Summary will update on new commits.}

[github-actions]

cmux status _{(one comment, edited in place; each line is updated by the job that owns it)}

Review dca0b5f: HQ feed card · gallery before/after runs · checks

App of this head (app.zip, kept 1 day)

gh workflow run reload-build.yml -R manaflow-ai/cmux --ref feat-cmux-next -f tag=pr33291 -f ref=docs/merge-main-old-git -f platform=macos -f backend_mode=local

Shipped in:

• cmux NEXT nightly 1.0.0-nightly.4160373381601 (d485585f77)
• cmux NEXT nightly 1.0.0-nightly.4160614853601 (0e8eb9bf99)

[blacksmith-sh]

Found 1 test failure on Blacksmith runners:

Failure

Test	View Logs
build_only must be a conjunctive exclusion on the helper, signing, and publication jobs , and must not gate the unsigned app build/ build_only must be a conjunctive exclusion on the helper, signing, and publication jobs , and must not gate the unsigned app build	View Logs

^{Need help on this PR? Tag @codesmith-bot with what you need.}

[cursor]

Bugbot needs on-demand usage enabled

Bugbot uses usage-based billing for this team and requires on-demand usage to be enabled.

A team admin can enable on-demand usage in the Cursor dashboard.

[lawrencecchen]

Review (independent-subagent): SHIP at dca0b5f

• I checked each statement in the new section against the code:
  • attr.tree is set to the base (merge_main_resolver.py:627).
  • merge-main.sh --dry-run returns before the git version check (merge_main.py:371-373).
  • The trusted drivers come from install-git-hooks.sh:313-325.
  • cmux-generated-v1 keeps your side with no conflict.
  • The web-bundle step agrees with step 3.
  • The config schema regeneration is on main only.
  • The receipt carry: risk_tier.py reads the exact head, and next-autoland carries only across its own web-flow merges.
• The first-pass BLOCK (one-side .xcstrings and pbxproj, missing bundle step and last-green pick, wrong attr.tree reason) is fixed. The three nits are fixed.
• Very small point, not blocking: the SDK regenerator is not named. "Let the PR autofix regenerate them" covers it.