chore(memory-bank): record the 5.0.0-rc2 release
5.0.0-rc2 is on the PowerShell Gallery and in the GitHub releases. The
PRs #99 to #106 were merged in order with merge commits, CI on master
passed, and the tag 5.0.0-rc2 on 7ddda8d published it on the third
attempt of the release run, after GitHub's Actions outage of 2026-10-05.
The open issues got their replies, 16 were closed, and the follow-up
issues #107 to #111 track the open Minor review findings.
- Decision 14: repository hardening is optional; the outdated "pending"
text is gone.
- Decision 15: merge stacked pull requests in order with merge commits.
- Decision 16: fix only reproducible bugs (the maintainer's decision D6).
- activeContext and progress: the CI fix 629f4e7, the copied inherited
entries behind #34, the issue state, and the next step (test rc2, then
5.0.0 or rc3).
- techContext: the current versions, the second workstation, and
one-line commands for the maintainer.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: AI Assistant <ai@example.com>
4 weeks ago
|
|
|
---
|
|
|
|
|
status: accepted
|
|
|
|
|
date: 2026-10-05
|
|
|
|
|
last-verified: 2026-10-05
|
|
|
|
|
owner: shared
|
|
|
|
|
source: maintainer decision of 2026-10-05
|
|
|
|
|
---
|
|
|
|
|
|
|
|
|
|
# Decision 15: Merge stacked pull requests in order with merge commits
|
|
|
|
|
|
|
|
|
|
- Choice: A stack of pull requests whose branches build on each other is
|
|
|
|
|
merged into `master` in order, each with **Create a merge commit**. The
|
|
|
|
|
merges wait for the CI run of the last pull request, which contains every
|
|
|
|
|
commit of the stack; an earlier one may fail tests that a later one fixes.
|
|
|
|
|
- Rationale: Squash and rebase merges rewrite the commits, so every later
|
|
|
|
|
pull request would conflict, and the commit IDs in the descriptions and
|
|
|
|
|
the changelog would no longer exist on `master`. A merge commit keeps
|
|
|
|
|
them, and each merge leaves `master` at the tree its pull request tested.
|
docs(memory-bank): record the integrated stack and curate the budgets
The maintainer merged the whole release-gate stack into master (fa0701b,
CI green): #116, #120 (it replaced #117, which GitHub closed unmerged when
the branch deletion after #116 removed its base), #118, and #119. rc7 is
not tagged yet.
Update the focus, evidence, next steps, progress, and deployment notes for
that state, and record the operating rule of a stack in Decision 15:
retarget before merging, delete head branches last.
The work of the night had pushed techContext (248 of 200 lines) and
systemPatterns (147 of 110) over their budgets, and activeContext and
progress close to theirs. Condense them and point to the records and to
Decision 24 for the detail; the full text is in git at 2b8643f. Port the
one durable pattern of the unmerged handoffs commit cb53fd7. The health
check passes: 0 errors, 2 near-limit warnings.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: AI Assistant <ai@example.com>
3 weeks ago
|
|
|
- Applied: 5.0.0-rc2, the PRs #99 to #106 on 2026-10-05; 5.0.0-rc7, the PRs
|
|
|
|
|
#116, #120, #118, and #119 on 2026-10-10.
|
|
|
|
|
- Operating rule (2026-10-10): retarget each pull request of the stack to
|
|
|
|
|
`master` (`gh pr edit <n> --base master`) before the one below it is merged,
|
|
|
|
|
and delete a head branch only when no open pull request uses it as its base.
|
|
|
|
|
Deleting a base branch through the GitHub CLI closed #117 without a merge:
|
|
|
|
|
GitHub did not retarget it. The open reports cli/cli#1168 and cli/cli#14223
|
|
|
|
|
show the same events (the first says that the button on the pull request
|
|
|
|
|
page retargets, the second quotes a maintainer who sees a platform issue) and
|
|
|
|
|
report that a closed pull request can't be retargeted or reopened while its
|
|
|
|
|
base is missing (not tried here). #120, a new pull request from the same
|
|
|
|
|
head, replaced #117. Nothing was lost; no content conflicted.
|
