When I'm working on multiple PRs, I also sometimes want them on the same branch so I can test against the whole. The arc workflow worked well for this, with the main problem being forced ordering for merges. Granted, I still like multi-commit PRs which phab frowned upon.
When I'm working on multiple PRs, I also sometimes want them on the same branch so I can test against the whole. The arc workflow worked well for this, with the main problem being forced ordering for merges. Granted, I still like multi-commit PRs which phab frowned upon.
Prior art:
ghstack land
actually pulling it into the real master (e.g.)master
but keeps individual commits in the branchWhat if we made a custom rebase,
git rewrite
^
when just a commit on the branchgit reset --hard
the branch names (or delete branches) and cherry-pick the old commits back on top--onto
(probably easier forfixup
, see below, because useer might have deleted commits, etc)git fixup
command to check tree hashes and rebase branches accordingly in case the user does agit pull --rebase
or something similargit publish
will sync the state with remote branches and create PRs if needed