This message was deleted.

cc @Taksh Singh who is working ona adding multi trunk support & might be able to see if your workflow will benefit from his changes

Thanks for the CC @Aryaman! @Taksh Singh – I would be interested if you thought the above workflow would fit with what you're planning.

Hi @Atlas Wegman thanks for explaining your workflow! Quick question: do you usually have multiple feature branches open at the same time? Also, based on my understanding, in your case, the branch

alpha

is synced with

develop

every day. Is this correct? If yes, I'm curious if you could merge into

develop

and wait for it to be merged into

alpha

@Taksh Singh – yes, multiple feature branches open would not be uncommon. Take this example: • Stack 1: Quick bugfix, one or two commits • Stack 2: Active main feature development • Stack 3: Quick improvement to an existing feature These three stacks could exist at the same time. Stack 1 and Stack 3 would likely merge directly to

develop

. Stack 2 would likely merge to

alpha

first. Theoretically, yes, any change merged to

develop

would be up-merged to

alpha

daily. The reason this doesn't work for our workflow is with Stack 2 (in the example above). I want this "feature" to exist only in

alpha

few a few weeks, therefore I cannot merge direct to

develop

.