Skip to content

Retro #35: falta el runbook de rebase de fork — el próximo fork vuelve a derivar todo el procedimiento #4

Closed

Description

@ddespinoza

Finding (retrospective of instalador #35, severity: medium)

The IntraVox rebase (47 local commits onto a pre-rewrite-published upstream) was improvised end to end: which conflict shapes take which side, when to regenerate (l10n source strings LAST, after every source settle), the reconciliation-commit pattern, and the four-gate verification recipe. Parent #27 still lists two more fork rebases (eurooffice, desktop_workspace). Every lesson lives in one agent session and nowhere else.

Fix

docs/fork-rebase.md here (org level — it serves every fork app), pointed to by each fork repo's AGENTS.md. Contents: the pre-rewrite-upstream twin (a local commit duplicated under another SHA upstream → skip), per-path merge policy (bundles → theirs; ratchets/manifests → regenerate at the end), the reconciliation commit, and the verification recipe (unit suite + phpstan + prebuild chain + zero-deletions diff against the pre-rebase backup).

Activity

  1. ddespinoza commented on Oct 24, 2026

    @ddespinoza
    ContributorAuthor

    Done in #6 — docs/fork-rebase.md; IntraVox's AGENTS.md points at it (IntraVox#19).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    ready-for-agentFully specified, ready for an AFK agent

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions