dev-tools

Feature Branch

A feature branch is a separate line of development in version control, created off the main branch, where a developer builds one feature or fix in isolation before merging it back — usually via a pull request that triggers code review and automated tests. It keeps unfinished work out of the shared trunk so main stays releasable, and gives each change a clean, reviewable diff. Feature branches underpin the popular "GitHub flow" and "Git flow" workflows. The tradeoff is drift: the longer a branch lives, the further it diverges from main and the more painful the eventual merge — which is exactly the problem trunk-based development pushes back against by keeping branches tiny and short-lived. For AI/SaaS builders the practical rule is to keep feature branches small and merge often: a branch scoped to a two-day change reviews easily and merges cleanly, while a three-week branch becomes a merge nightmare and blocks everyone else's integration. Pair feature branches with required reviews and green CI before merge.

Related terms

More Dev Tools terms