NTFSSecurity/.memory-bank/decisions/0015-merge-stacks-with-merg...

---
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.
- Applied: 5.0.0-rc2, the PRs #99 to #106 on 2026-10-05.
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.
			`- Applied: 5.0.0-rc2, the PRs #99 to #106 on 2026-10-05.`