I added a description of the workflow for multiple dependent diffs here: https://ghc.haskell.org/trac/ghc/wiki/Phabricator#Workingwithmultipledependentdiffs
Please let me know if anything doesn't make sense. Note that I never let arc squash my commits, keeping commits 1:1 with diffs makes things a lot simpler. On 1 October 2016 at 21:49, Brandon Allbery <allber...@gmail.com> wrote: > On Sat, Oct 1, 2016 at 4:47 PM, Simon Marlow <marlo...@gmail.com> wrote: > >> A nice trick for dealing with stacked diffs in Phabricator is to use "git >> rebase -i" to modify diffs in the middle of the stack. You can also insert >> "x arc diff" between lines to automatically update later diffs on >> Phabricator after a rebase lower down the stack. >> >> You only need a single branch for the whole stack, and continually rebase >> it. I also push the whole branch to github to get Travis to build it, but >> that's optional. >> > > Perhaps someone could put a sample workflow on (one of...) the wiki(s). > > -- > brandon s allbery kf8nh sine nomine > associates > allber...@gmail.com > ballb...@sinenomine.net > unix, openafs, kerberos, infrastructure, xmonad > http://sinenomine.net >
_______________________________________________ ghc-devs mailing list ghc-devs@haskell.org http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
