>> My git fu was not strong enough and so the "next" branch is a bit messy
>> right now. (I tried to activate a local clean version of the "next"
>> branch.)
>> [...]
>> Can someone help to clean up the "next" branch, please?
>
> I think I cleaned it.
Thank you so much!
> To prevent further complications with this branch, I suggest to treat is
> like master and master like maint. I.e., every commit done in master is
> duplicated into next so that final merge is easier.
> WDYT?
This is a clear rule, which is easy to follow and easy to remember (at
least for me). I love this!
Thanks and best regards,
Marco