Long branch or a flag behind main

Flags for anything longer than a few days. A branch that lives two weeks becomes a merge event; a flag makes the same work a series of small changes. The cost is discipline about removing flags, which is the part every team underestimates.

An afternoon to do it properly the first time, then minutes when it recurs. Most of the first afternoon goes into discovering which of the defaults do not match your situation.