so if you track project state with branches (for say versions) and you need to apply 'new feature' to all this n branches, does that mean n merges for your team? not for ours.<p>in all fairness, there is stacked git.  go crazy.