> This seems to be advocating the second workflow, i.e. pushing on a short lived branch then merging back in No, in trunk-based development, you push to the tr

> This seems to be advocating the second workflow, i.e. pushing on a short lived branch then merging back in No, in trunk-based development, you push to the trunk, aka master. The difference is perhaps not that big; with TBD, you have a branch, but only on your machine, which you merge to master before pushing, whereas with the second workflow, you push your master, then merge somehow. > their intermediate setup seems impractical technically for most setups - how do you run standard tests without committing your code, unless you do everything locally? I don't understand this. Of course you can and should run all tests locally.