On Mon, Jun 15, 2020 at 3:41 PM Matias N. <mat...@imap.cc> wrote: > Functionally, yes. But git has troubles recognizing that the cherry-picked > commits are the same on master and generates conflicts. The merge would > solve this in theory, since the release branch tip would end up matching a > commit on master.
Suppose in the future we wish to have LTS releases -- Long Term Support, where "Support" just means that the release line receives bugfix and security fix maintenance for a longer period of time than regular releases. We briefly touched on this idea recently but are not ready to do it yet. Nevertheless, as an example only for illustration, suppose that an LTS release is to be maintained for 2 years. Then, how does the strategy of merging release branches back to master support that type of requirement? Nathan
