Skip to content

Instantly share code, notes, and snippets.

@robandpdx

robandpdx/stacked-diff-workflow.md

Last active February 23, 2023 17:37
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save robandpdx/6374671520a1b5a7d06704fac3746cad to your computer and use it in GitHub Desktop.
Save robandpdx/6374671520a1b5a7d06704fac3746cad to your computer and use it in GitHub Desktop.
Download ZIP
Raw
stacked-diff-workflow.md

Stacked diff workflow

ghstack

ghstack
Stacked diffs and ghstack
Ghstack is a little rough around the edges. It seems to work as advertised, but some of the ways it works are a bit quirky. The following is a list of things I don't like about ghstack:

  • it creates 3 branches for each commit
  • PR are from head->base rather than from branch->master
  • you need force push access to main in order to land a PR
  • branch protection rules are useless, need to be bypassed by force pushes

This UI can be used to view your stacked PRs created by ghstack...
ReviewStack

Graphite

Graphite
Graphite demo video
Graphite seems to be a very well refined tool for creating and managing a stacked diff workflow. You can keep your branch protection rules, you don't need force push access, the PRs are from branch->main.

Sapling

Sapling

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