This is an automated email from the ASF dual-hosted git repository.

papegaaij pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git


The following commit(s) were added to refs/heads/master by this push:
     new 8c19832352 Tell agents never to rewrite commits that have been pushed
8c19832352 is described below

commit 8c198323529803a6e8c6d43f6332b785c73c8289
Author: Emond Papegaaij <[email protected]>
AuthorDate: Tue Nov 10 11:27:16 2026 +0100

    Tell agents never to rewrite commits that have been pushed
    
    AGENTS.md said nothing about rewriting history, and agents repeatedly
    reached for a rebase or an amend to update a branch that was already on
    the remote. That leaves a commit that can only be published by a force
    push, which this repository rejects, and on a pull request branch it
    would rewrite history its reviewers have already seen. The most recent
    case rebased the branch of a stacked pull request to drop the base
    pull request's commit, on the assumption that the base would be
    squash-merged; it had been merged with a merge commit, so its commit was
    already in master and there was nothing to drop.
    
    AGENTS.md now forbids rebasing, amending or squashing anything already
    on a remote branch. A pushed branch is brought up to date by merging
    master into it, and a pushed commit is corrected with a new commit on
    top. It also states that pull requests are merged with a merge commit,
    so a stacked branch's base commits never need dropping.
    
    Co-Authored-By: Claude Opus 5.5 <[email protected]>
---
 AGENTS.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/AGENTS.md b/AGENTS.md
index a348ee0c09..4f6270d253 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -35,6 +35,11 @@ header — copy it when you add one.
   request, don't tag unless you were told to do so.
 - Fixes go on `master` first and are cherry-picked down the maintenance lines 
afterwards, as far
   as the fix still applies. Which lines are in scope is a decision, not an 
inference — ask.
+- Never rewrite a commit that has been pushed: no rebase, no amend, no squash 
of anything already
+  on a remote branch. The repository rejects force pushes, and a pull request 
branch is shared
+  with its reviewers. Bring a pushed branch up to date by merging `master` 
into it, and correct a
+  pushed commit with a new commit on top. Pull requests are merged with a 
merge commit, so the
+  commits of a branch you stacked on stay in `master` and never need dropping.
 
 ## Commits
 

Reply via email to