Hi, Alexander! On Dec 19, Alexander Barkov wrote: > > I created a new branch bb-10.2-ext. > > So the tentative data flow looks like this: > > 10.2---------->10.3 <---(once) > \ ^ ^ > \ | | > \- bb-10.2-ext ---> bb-10.2-compatibility > > > > - 10.2 will be periodically merged to 10.3. > - bb-10.2-ext will be periodically rebased on top of 10.2 > - bb-10.2-compatibility will be periodically rebased on top of bb-10.2-ext. > - bb-10.2-ext will be periodically merged to 10.3
No, please, never do that. You cannot have "bb-10.2-ext will be periodically rebased" and "bb-10.2-ext will be periodically merged to 10.3" both at the same time. If you've merged some commit into 10.3, you cannot rebase it anymore. You can either "periodically rebase bb-10.2-ext on 10.2" or "periodically merge bb-10.2-ext in 10.3" I suggest the former. > - bb-10.2-compatibility will once (when it's ready) be > merged or rebased to 10.3 > Regards, Sergei Chief Architect MariaDB and [email protected] _______________________________________________ Mailing list: https://launchpad.net/~maria-developers Post to : [email protected] Unsubscribe : https://launchpad.net/~maria-developers More help : https://help.launchpad.net/ListHelp
