3 ms·
Drop Github, use something like Gerrit and then embrace linear history. If you have very active development with frequent conflicts (requiring lots of rebasing
by tazjin 5y ago
Drop Github, use something like Gerrit and then embrace linear history. If you have very active development with frequent conflicts (requiring lots of rebasing to get things merged) you might want to look at a merge bot like gerrit-queue, but don't do it before it becomes a problem.
- Osiris 5y agoA solo developer may be able to make this call but in any size organization, good luck with that.
- searealist 5y agoEven if you have linear history on main (squash commits from PRs). You still have this problem if you have multiple out-standing PRs and one of them is dependent on another.
- tazjin 5y agoIn Gerrit, the review unit is commonly one commit. IMO the Github pattern of bundling several changes in one review is a mistake.
- u801e 5y agoEven the email based flow presents a series of changes as a thread of email messages, so the association between changes that are related or depend on each other is maintained. Once a patch set looks good to the maintainer, it's merged. Email clients do enforce looking at the changes as a series of diffs on a per commit basis.
- searealist 5y agoThere are 2 possibilities: 1) Gerrit doesn't support stacked PRs 2) You have this rebase problem.