On Sun, Dec 29, 2019 at 5:49 AM Julien '_FrnchFrgg_' RIVAUD <frnchf...@free.fr> wrote: > > Which brings me to something I find strange in your policy: to me, > merges from trunk to branches should be rare if not nonexistent. And you > are deciding to banish merges the other way around.
Out of curiosity, why do you say that merges from trunk to branches should be rare? It seems to me that any long-lived development branch will require merges from trunk to the branch. Are you saying that those kinds of branches are rare? In GCC we have historically had a pattern in which people use long-lived parallel branches that maintain specific patches on top of GCC trunk. These branches provide a simple way to get a variant of GCC with specific patches of interest to some people. These branches too require regular merges from trunk. Ian
