diff --git a/docs/north-star/dev-preferences.md b/docs/north-star/dev-preferences.md index a55f9f87..f851dafc 100644 --- a/docs/north-star/dev-preferences.md +++ b/docs/north-star/dev-preferences.md @@ -60,6 +60,8 @@ Fix review findings on their pull request's branch. A finding about behavior get For one branch, rebase onto `origin/main`, push with `--no-verify --force-with-lease`, and run `just signoff`. Then push the SHA of its `Signed off on ` line with `git push --no-verify origin :main`. +`just merge` does these steps for one rebased and pushed branch. It runs `just signoff` when the head has no green `signoff` status. Then it pushes the signed SHA to `main`. Then it updates the nicely clone on om1, mbp, and the Mini. + These pushes skip the pre-push `just test`, because `just signoff` checks that commit. `main` receives only that signed SHA, even when the branch moves later. An admin push bypasses the `signoff` ruleset, so never push the branch name to `main`. Every other push keeps the hook. For a stack, follow Land in `gh-stack` for a project that pushes its head to trunk, with these checks. Steps 2 and 7 skip the hook too, because `just signoff-layers` checks each layer: diff --git a/justfile b/justfile index 277aad0e..5849498d 100644 --- a/justfile +++ b/justfile @@ -198,3 +198,8 @@ signoff: [positional-arguments] signoff-layers *branches: @exec bash scripts/check-layers.sh --signoff "$@" + +# Merge this branch's pull request: sign off if needed, push the signed SHA to main, then update the nicely clone on every fleet machine +[positional-arguments] +merge *args: + @exec uv run ~/.claude/skills/fleet/scripts/fleet_merge.py --method fast-forward "$@"