<p><pre><code>    &gt; or if you handle it by merging daily
</code></pre>
Right, as far as I remember the &quot;successful git branching model&quot; still allows - even encourages - merging master back into feature branches.<p>&quot;Long-lived&quot; doesn&#x27;t have to mean &quot;really out of date&quot;.