docs(agents): sync-back landings are fast-forward, never squash - #11964
Merged
diegosouzapw merged 1 commit intoAug 29, 2026
Merged
Conversation
Records the v3.8.50 → v3.8.51 precedent in the single source of truth: a main → release/vX+1 sync PR lands by fast-forward push so main stays an ancestor of the release branch (squash re-conflicts the next sync-back on every file main touched — 551 conflicts this cycle before the two-step merge), plus the two post-landing checks (ancestry assert; ratchet files carried main's freezes). The full procedure lives in the generate-release Phase 5 skill.
muhamadgalihsaputra
pushed a commit
to niyatna/NiyatnaRoute
that referenced
this pull request
Sep 27, 2026
…osouzapw#11964) Records the v3.8.50 → v3.8.51 precedent in the single source of truth: a main → release/vX+1 sync PR lands by fast-forward push so main stays an ancestor of the release branch (squash re-conflicts the next sync-back on every file main touched — 551 conflicts this cycle before the two-step merge), plus the two post-landing checks (ancestry assert; ratchet files carried main's freezes). The full procedure lives in the generate-release Phase 5 skill.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Regra nova em
AGENTS.md→ Git Workflow, logo após o Base-green check: um syncmain → release/vX+1entra por fast-forward push, nunca squash — squash tira amainda ancestralidade da release e o próximo sync-back reconflita em todo arquivo que amaintocou (551 conflitos neste ciclo antes do merge em duas etapas). Inclui os 2 checks pós-pouso (assert de ancestralidade; arquivos de ratchet carregaram os congelamentos damain— eles mergeiam comooursem silêncio).O procedimento completo e as quatro verificações baratas antes de rotular um vermelho (
runner_name, checkout raso, shard travado, lint só em sala limpa) foram para as skills (.agents, repo próprio:generate-release/phases/phase-5-next-cycle.mde_shared/merge-gates.md§3, commit8650fe1).Só documentação;
check:docs-syncecheck:fabricated-docsverdes localmente.