Feature Branches
ELI5 — The Vibe Check
Feature Branches mean you create a new branch for every feature, bug fix, or experiment. Work in isolation, make a PR when ready, merge when approved. It's the most common Git workflow because it's simple: your mess stays on your branch until it's clean enough for main.
Real Talk
Feature branching is a workflow where each unit of work (feature, bugfix, refactor) is developed on a dedicated branch created from the main branch. Changes are integrated via pull requests with code review. Branch lifetime varies from hours to weeks depending on team practices.
When You'll Hear This
"Create a feature branch, do the work, open a PR — that's our workflow." / "Long-lived feature branches always lead to painful merge conflicts."
Related Terms
Git Flow
Git Flow is a branching model with specific branches for features, releases, hotfixes, and development. It's like a highway system with designated lanes.
GitHub Flow
GitHub Flow is Git Flow's chill younger sibling. One rule: main is always deployable. Branch off main, do work, open a PR, merge to main, deploy.
Trunk-Based Development
Instead of giant feature branches that live for 3 weeks and cause merge hell, trunk-based development has everyone commit to main every day.