chore: prune 24 stale remote feature branches #167
No Assignees
Notifications
Due Date
No due date set.
Dependencies
No dependencies set.
Reference: sneak/AutistMask#167
Reference in New Issue
Block a user
Problem
origincarries 26 branches. Excludingmain, 24 are stale feature branchesfrom already-landed work:
TODO.md:51-52already carries this as a Future Step.The catch — do not use
--mergedgit branch -r --merged origin/mainreports zero merged branches, becausePRs in this repo are squash-merged: the branch tip is never an ancestor of
main. A naive--mergedsweep would delete nothing, and a naive"delete everything that isn't main" would risk destroying unlanded work.
Several of these names also look like superseded duplicates of one another
(three variants for issue 99, two for issue 87, three for issue 82), which
suggests abandoned attempts alongside the one that actually landed. Those still
need checking rather than assuming.
Implementation requirements
main.Squash-merges mean you must compare content, not ancestry. Workable
approaches:
git cherry -v origin/main <branch>, or diffing the branchagainst its merge-base with
main(
git diff $(git merge-base main <branch>) <branch>) and checking whetherthat diff is already present in
main, or matching the branch to its closedPR via the tracker.
closed and merged. A branch whose PR was closed without merging is not
safe to delete on that basis alone.
(safe), superseded duplicate (safe, name the branch that won), or
unlanded (do not delete).
so it can be triaged separately. Do not guess.
origin, and only after the classification is posted here.Local branches in the shared clone are already down to
mainalone.main, and do not force-push anything.Definition of done
or unlanded, with the evidence used for each.
origin.git ls-remote --heads originafterwards shows onlymainplus anydeliberately retained branches.
TODO.mdFuture Step for branch pruning is removed in the same commit aswhatever documentation change accompanies this.
Plan: classify every remote branch except
main,next,prodand open-PR branches (the 24 above plus the head branches of squash-merged PRs since), from the tracker and from content where there is no merged PR; post the classification here first; delete only landed or superseded ones; list anything unlanded for triage. A small PR then updatesTODO.md.Model: opus-5-5
Classification of every branch on
originexceptmain,nextandissue-487-firefox-allowed-error(head of the open #490). There is noprod. Every pull request from these branches is marked closed without merging, so each branch was checked by content againstorigin/next. Three branches on the issue's list,chore/token-list-enrichment,feat/message-signingandfix/59-transaction-view-ui-policies, were already gone fromorigin.fix/99-block-number-clickable5565e76, merged by #102issue-99-block-number-external-link5565e76, merged by #102fix/issue-99-block-number-link-copyissue-99-block-number-linkissue-99-block-number-stylingissue-99-block-number-linkfeature/82-warn-new-addressissue-82-zero-tx-warningfeature/82-zero-history-warningissue-82-zero-tx-warningfeature/issue-82-new-address-warningissue-82-zero-tx-warningfeature/copy-flash-feedbackfix/issue-100-copy-flash-feedbackfeature/expanded-warningsfix/issue-114-expanded-warningsnextfix/116-timestamps-include-timezonefix/issue-116-timestamp-timezonefix/55-swap-show-own-addressfix/55-swap-tx-addressfix/70-confirm-tx-contract-displayfix/confirm-tx-contract-displayfix/77-confirm-tx-persistfix/issue-77-confirm-tx-persistfix/cross-wallet-duplicate-detectionfix/issue-111-cross-wallet-dedupfix/issue-72-address-token-tx-historyfix/72-address-token-tx-historyfix/issue-58-receive-address-consistencyfeat/issue-131-transaction-view-layoutfix/issue-131-transaction-view-reorderfeature/show-private-keynextfix/consistent-error-displaynextstill usesexport-privkey-flash,delete-wallet-flashandshowFlash()for these validation errorsfix/87-consistent-error-displayfix/87-consistent-error-display-v2Deleting the 17 landed and superseded branches from
originnow.For triage: #87 is closed, but its change never landed; the three error-display branches are versions of that one change, written against February's code. The clipboard policy section is the only part of
feature/show-private-keymissing fromnext.Model: opus-5-5
The 17 landed and superseded branches above are deleted from
origin. The four unlanded ones stay for triage, along withmain,next, the head of the open #490, andissue-167-prune-branchesfor #491, which adds theTODO.mdCompleted Steps entry.Model: opus-5-5
Classification of the three branches on this issue's list that were deleted from
originon 2026-09-09, from their last commits, fetched by hash:feat/message-signing(71f1d11)9e45c75innextis a later version of this commit (same author, author date, message and parent) and has every line71f1d11adds, except thatnextkeeps transaction approvals, not only sign approvals, pending when the popup closesfix/59-transaction-view-ui-policies(1df770d)607d234; the tip1df770d, not part of that merge, adds a plain-numberrawValueto the swap Amount line and takes the token from the Token In line, the same fix2fbed34landed through #94chore/token-list-enrichment(f7a2437)scripts/apply-enrichment.mjs,scripts/enrich-tokens.mjsandscripts/token-enrichment.json; none of the three is innext, only the token names and URLs they produced are insrc/shared/tokenList.js(sinceaca8c4b); no pull request was opened from itRestored:
chore/token-list-enrichmentis re-created onoriginatf7a2437, so its work is kept. The two landed branches stay deleted.For triage:
chore/token-list-enrichment; whether to bring its tooling into the repo is the open question #495.Model: opus-5-5
feature/show-private-key(78c050e) is now superseded, not unlanded: viewing the key landed through #31 (the ExportPrivKey screen), and its README clipboard policy section, the only part missing, landed through #494 (the Clipboard paragraph under ExportPrivKey). Deleting it fromoriginnow.Model: opus-5-5