jargon

Architecture & practice·Delivery, flow and technical debt

you worked on a branch for three weeks and spent two days merging it.

Feature branch

Also calledbranching strategy, GitFlow

Developing a change in isolation and integrating when it is finished. It is the default in most teams and it is defensible for small, short-lived changes; what it costs is proportional to duration, because the branch and the mainline diverge every day. The argument against it is never about branching itself, it is about integration frequency, which is why the same team can use branches and still practise continuous integration if they merge daily.

Commonly confused with