3 ms·
You can do stacked diffs on GitHub by always using squash merges and rebasing on top of master, and it's a great way to get started. It's just a lot nicer with
by lima 8y ago
You can do stacked diffs on GitHub by always using squash merges and rebasing on top of master, and it's a great way to get started.
It's just a lot nicer with the extra tooling on top that Phabricator and Gerrit provide (dependencies, command line tools, and so on).
- mullsork 8y agoIt's true that you can do that indeed. Annoyingly, you have to manually rebase if you want to use the "merge & squash" feature. I don't understand why there's no "merge into one commit, rebase with master, merge onto master" feature. It's tedious to manually keep rebasing branches that were approved for review but have gone behind.
- yxhuvud 8y agoIf you squash merge you just lost all the small commits that do one thing well that you spent time creating, unless you review them one by one. Bleh.