220
[Julia Evans] Combining Branches
(programming.dev)
Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.
Resources
Rules
Git Logo by Jason Long is licensed under the Creative Commons Attribution 3.0 Unported License.
Shared branches should always only move forward. Most Git-* systems support stuff like protected branches.
I personally like tidying up your own feature branch with rebasing and then merging it into main (preferably using only FF merges). However this is not scalable for some larger projects, and for example monorepos also make this hard to accomplish. In those cases the solution ends up being squash+merge.
The extra information about the squashed commits is usually persisted to these systems (GitHub PRs, GitLab MRs, etc) so you don't really lose much, I guess. Although I do prefer keeping it all in plain git.