docs: Also prohibit --amend on stack branches

adinauer · adinauer · commit 6f90ea7c801b · 2026-04-02T07:55:51.000+02:00
diff --git a/.cursor/rules/pr.mdc b/.cursor/rules/pr.mdc
@@ -259,4 +259,4 @@ git push
 
 Prefer merge over rebase — it preserves commit history, doesn't invalidate existing review comments, and avoids the need for force-pushing. Only rebase if explicitly requested.
 
-**Never force-push stack branches.** Do not use `--force`, `--force-with-lease`, or `git push` after `git commit --amend` on branches that are part of a stack. Force-pushing a stack branch can cause GitHub to auto-merge or auto-close other PRs in the stack. If a commit needs fixing, add a new commit instead of amending.
+**Never amend or force-push stack branches.** Do not use `git commit --amend`, `--force`, or `--force-with-lease` on branches that are part of a stack. Amending a pushed commit requires a force-push, which can cause GitHub to auto-merge or auto-close other PRs in the stack. If a commit needs fixing, add a new fixup commit instead.

Original file line number	Diff line number	Diff line change
`@@ -259,4 +259,4 @@ git push`
`259`	`259`
`260`	`260`	`Prefer merge over rebase — it preserves commit history, doesn't invalidate existing review comments, and avoids the need for force-pushing. Only rebase if explicitly requested.`
`261`	`261`
`262`		-Never force-push stack branches. Do not use `--force`, `--force-with-lease`, or `git push` after `git commit --amend` on branches that are part of a stack. Force-pushing a stack branch can cause GitHub to auto-merge or auto-close other PRs in the stack. If a commit needs fixing, add a new commit instead of amending.
	`262`	+Never amend or force-push stack branches. Do not use `git commit --amend`, `--force`, or `--force-with-lease` on branches that are part of a stack. Amending a pushed commit requires a force-push, which can cause GitHub to auto-merge or auto-close other PRs in the stack. If a commit needs fixing, add a new fixup commit instead.