long-lived and short-lived branches

Also written: long-lived branch, short-lived branch

A short-lived branch lasts hours or days; a long-lived one lasts weeks or forever, like `develop`. The longer a branch lives, the bigger its conflicts.