stacked-pr

To propagate changes in a stacked PR workflow, you rewrite the parent branch and apply updates to child branches using a Git reset and cherry-pick sequence. This ensures dependent branches receive the correct changes while maintaining a linear history.

Managing fixup commits in dependent branches requires targeting the specific commit intended for correction. This workflow applies the fixup directly to its target during the rewrite phase, preventing history pollution and keeping the branch chain clean.

Conflict resolution when rebasing stacked Git branches involves addressing mechanical, semantic, and generated conflicts. The workflow provides specific strategies for each type during the reset and cherry-pick process, ensuring changes are applied correctly across the dependent branch chain.

To update generated commits in a multi-branch Git workflow, you use a drop-and-rerun pattern. This approach manages deterministic commits like dependency updates or codegen outputs by discarding the old commit and regenerating it fresh during the branch propagation process.

Yes, you need Git command-line proficiency and a solid understanding of branch management principles to manage stacked branch workflows. The process relies heavily on manual reset and cherry-pick mechanics to propagate changes correctly across chains of dependent branches.

You should avoid a stacked PR workflow if your Git branch management strategy does not rely on chains of dependent branches. The workflow is specifically designed for scenarios involving intermediate branches, using reset and cherry-pick mechanics that are unnecessary for simpler, independent feature branches.