Skip to content

docs(policy): delete head branches on merge; define merged branches - #736

Merged
yifanxuaaa merged 1 commit into
layerfs_v2_0_0from
docs/merge-branch-policy
Nov 18, 2026
Merged

yifanxuaaa merged 1 commit into
layerfs_v2_0_0from
docs/merge-branch-policy

Conversation

@yifanxuaaa

Copy link
Copy Markdown
Contributor

Updates the code review policy §Merging:

  • The merger deletes the PR's head branch on GitHub in the same step; stacked PRs are retargeted first.
  • New Removing branches section: main and layerfs_v2_0_0 are never deleted. A branch is merged when its tip is an ancestor of a release branch, it is the head of a merged PR at the merged tip, or every commit is patch-equivalent (git cherry). Anyone may delete a merged branch, using a SHA lease. Unmerged branches and bases of open PRs stay with their owners. Each sweep records names and tips.

Production LOC: 188532 -> 188532 (delta 0); docs-only.

Sweep done under this rule (2026-11-18)

77 merged branches deleted with SHA leases (52 ancestors of layerfs_v2_0_0/main, 23 squash-merged PR heads, 2 fully patch-equivalent). Kept: 13 unmerged branches (docs/layerfs-2.0-assets, dsh-layerfs/project-storage, ephemeral-machine, fix/538-close-refuse, fix/538-custody-retry, fix/538-unmount-retry — bases of open PRs #653/#654, issue420-postgresql, issue512-vm-backend, issue-fuse-profile-tuning, opt/88-ring-admission, paper/write-in-public, storage-report-v2, wip/local-unmount-work).

Deleted branches and tips (restore with git push origin <sha>:refs/heads/<name>)
Branch Tip Reason
add-plugin-dsh-layerfs 7244991da7 ancestor:layerfs_v2_0_0
benchmark/symlink-hardlinks b9ad9edd7e ancestor:layerfs_v2_0_0
claude/cancel-exit-status df242d2a01 squash-merged-pr
claude/disk-space-v2 393a1c9a61 squash-merged-pr
claude/exec-concurrent-test f19793bcaf squash-merged-pr
claude/gc-mark-header-edges c32a6dcbab ancestor:layerfs_v2_0_0
claude/gc-simplify f2e27d7bdf ancestor:layerfs_v2_0_0
claude/home-setup-a1 df3ebd2c34 ancestor:layerfs_v2_0_0
claude/issue428-sdk-packages-cd9412 7109a71be9 ancestor:layerfs_v2_0_0
claude/issue527-platform-pass-e05aa3 b02242fd59 ancestor:layerfs_v2_0_0
claude/issue529-sandbox-platform-559e87 ddc7c5696b ancestor:layerfs_v2_0_0
claude/metrics-182-348ba7 cc40c90eda squash-merged-pr
claude/monitoring-179-2a14c1 3237813929 squash-merged-pr
claude/nfs-unmount-644-fixes 05aa187f5a ancestor:layerfs_v2_0_0
claude/normal-durability 5787643541 squash-merged-pr
claude/pg-implicit-attach c3c6c9d568 squash-merged-pr
claude/workspace-usage ffd549d47e squash-merged-pr
commit-fast bd21785a1f ancestor:layerfs_v2_0_0
connect-cli/phase1-137 c6fa2dfeb6 ancestor:layerfs_v2_0_0
control-split 8464d23e4c ancestor:layerfs_v2_0_0
docs/agents-guides-reorg 0003c7fc26 squash-merged-pr
docs/code-review-policy 8a9eb788d7 squash-merged-pr
docs/gc-41-items-27-44 254b27c352 ancestor:layerfs_v2_0_0
docs/gc-41-spec-revision 23c08b835a patch-equivalent:v2
docs/659-call-log 4df8186559 ancestor:layerfs_v2_0_0
doctor-implementation-116 c4fbf039fa ancestor:layerfs_v2_0_0
dsh-layerfs/include-storage a7b697b4ab ancestor:layerfs_v2_0_0
exec-clone-into-cgroup 6eb2190d47 squash-merged-pr
exec-speed 8482633f5f ancestor:layerfs_v2_0_0
feat/pg-store-attach 545889d90a ancestor:layerfs_v2_0_0
feat/sandbox-images 0c18d49a72 squash-merged-pr
feat/659-call-log 07715cd212 ancestor:layerfs_v2_0_0
fix/chain-budget-scales-with-cutoff 3b10fef9cb ancestor:layerfs_v2_0_0
fix/disable-firecracker-ssh 671ed70624 squash-merged-pr
fix/exec-close-force-cancel 01dec9d5d3 squash-merged-pr
fix/fp21-provider-gate ff7ccee2f6 ancestor:layerfs_v2_0_0
fix/lease-stale-race 14f62997b8 ancestor:layerfs_v2_0_0
fix/machine-stop-force-cancel 2ad4d294f6 squash-merged-pr
fix/pr496-abort-custody 69fedcacf0 ancestor:layerfs_v2_0_0
fix/store-lease-test-boundary 99c5b60b1e squash-merged-pr
fix/windows-wsl-live 8209716f0d squash-merged-pr
fix/547-slice-12 50243b9c47 ancestor:layerfs_v2_0_0
fix/547-slice-34 305dea8aa7 ancestor:layerfs_v2_0_0
fix/547-slice-56 7a24b34c2f ancestor:layerfs_v2_0_0
fix/649-down-capacity af1c660326 ancestor:layerfs_v2_0_0
fix/679-unmount-skips-deferred-reclaim 8c53ec33b0 squash-merged-pr
fix/691-publish-followup 47265fc2dc squash-merged-pr
gc-2.0-final 53dac0441b ancestor:layerfs_v2_0_0
integrate/v2-force-stop-latest d303c7b03c squash-merged-pr
issue5-backup-progress bb38df7a88 ancestor:layerfs_v2_0_0
issue30/node 13ce03dbde squash-merged-pr
issue30/python 89ee53940f squash-merged-pr
issue113-exec-cancel e0468a34d8 ancestor:layerfs_v2_0_0
issue113-gaps ecab69603f ancestor:layerfs_v2_0_0
issue410-init-refusal 34c96b8208 ancestor:layerfs_v2_0_0
issue426-forced-unmount 888ae70cd9 ancestor:layerfs_v2_0_0
issue442-fs-mode d8d6f54c18 ancestor:layerfs_v2_0_0
issue463-layer-split f406638c80 ancestor:layerfs_v2_0_0
issue506-store-backends-remote da70f98745 ancestor:layerfs_v2_0_0
machines-live 3f2e33b23f ancestor:layerfs_v2_0_0
opt/84-final-int 7691ac20b0 patch-equivalent:v2
opt/86-oneshot-wal-fix 8a23d02d11 ancestor:layerfs_v2_0_0
opt/86-sqlite-wal-checkpoint 48168dd625 ancestor:layerfs_v2_0_0
opt/87-pg-init-cleanup c86b6bbe34 ancestor:layerfs_v2_0_0
opt/88-ring-admission-v2 985c6fdf71 ancestor:layerfs_v2_0_0
opt/88-small-file-delta-base 714de4a16f ancestor:layerfs_v2_0_0
opt/89-chain-root-rebase b0248397b4 ancestor:layerfs_v2_0_0
opt/90-pg-narrow 55383742f7 ancestor:layerfs_v2_0_0
opt/91-gap-blocks b293887488 ancestor:layerfs_v2_0_0
opt/92-dir-extent-deltas c5604ef662 ancestor:layerfs_v2_0_0
pg-always-compiled 462ae6d3df squash-merged-pr
pg-perf ddd1bc83cd ancestor:layerfs_v2_0_0
pg-r2 6f09a1fdde ancestor:layerfs_v2_0_0
pr600-export-port 4c1ed1ac42 ancestor:layerfs_v2_0_0
rm-microsandbox-ssh 4ee6870e97 ancestor:layerfs_v2_0_0
sdk/branch-file-128 91a5940605 ancestor:layerfs_v2_0_0
store-transfer-613 ab4c1a4712 ancestor:layerfs_v2_0_0

🤖 Generated with Claude Code

Adds to the code review policy's Merging section: the merger deletes the
PR's head branch on GitHub (retargeting stacked PRs first), and a new
"Removing branches" section that defines when a branch counts as merged
(ancestor of a release branch, head of a merged PR at the merged tip, or
fully patch-equivalent), allows anyone to delete such a branch with a SHA
lease, and keeps unmerged branches and bases of open PRs for their owners.

Production LOC: 188532 -> 188532 (delta 0); docs-only commit. Scope:
core/engine/control/api production source, tools/production_loc.py at the
parent; reference absent (retired R9c; last counted 65,417 at tree
498dd19).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@yifanxuaaa
yifanxuaaa merged commit caff58a into layerfs_v2_0_0 Nov 18, 2026
@yifanxuaaa
yifanxuaaa deleted the docs/merge-branch-policy branch November 18, 2026 08:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant