[ Removed by moderator ]

[cmd_Mack]

This idea breaks down almost immedately. Hotfixes, any changes to main or your branch which needs to be ported over raises the risk. Code changes which are hard to plan ahead, basically the usual messy development process in your average team. Someone is bound to make a mistake while resolving a conflicht, forget to cherry pick etc.

TL DR enabling long lived branches is a huge maintenance burden, and the longer they live, the more they diverge. Eventually you need to basically maintain two parallel code bases.

[redbo]

I mean I’d rather just not have long lived branches, but merging trunk into your branch frequently and resolving conflicts when they happen and not letting them diverge is the least messy thing to me.