Git branching strategies
How teams organise work in Git: feature branches and pull requests, trunk-based development with short-lived branches and feature flags, GitHub flow, Git Flow with develop and release branches, release branches for supported versions, merge commits versus squash versus rebase, branch protection, naming conventions, and choosing a strategy for your team.
CodexBash, , 6 min read
Git makes branches cheap, which raises a question every team must answer: how should we use them? When do we create a branch, how long does it live, how does work get back into the main line, and how do releases happen? The answer, your branching strategy, shapes how often code is integrated, how painful merges are and how quickly changes reach users. This article explains the common strategies, their trade-offs, and the merge and protection settings that go with them.
Sign in to read the rest
The whole 6 minute article is free with an account, along with every problem, lesson and tutorial. No card.