3 ms·
Squash-merge PRs. You can configure this in GitLab, GitHub, and Azure DevOps. Your private commits can be whatever you want and they get rolled up to a single
by immutology 5y ago
Squash-merge PRs. You can configure this in GitLab, GitHub, and Azure DevOps. Your private commits can be whatever you want and they get rolled up to a single PR commit when your working branch is merged to trunk.
- beders 5y agoYes. Much easier to roll back things, cherry pick things and blame people ;) Don't you dare merge a PR with 30 commits.
- conradludgate 5y ago+1 to this. I like the mantra that every commit is deployable
- seba_dos1 5y ago"Every commit is deployable" isn't at odds with merging multi-commit MRs, provided that the submitter actually did their job well. I find squash-merging to be an ugly workaround, not a proper solution. Good non-trivial merge requests should usually consist of multiple commits that improve readability, revertability, cherry-pickability and blamability ;)