[redsaz]

Has your team considered using feature flags? For large changes that can span weeks of effort, being able to PR and get small portions in to main branch and then "flip the switch" at the end usually works out better for us than "okay our feature branch is done but now we have to catch it back up to everything that happened in the meantime from the past few weeks."

[SergeAx]

We are thinking about it. There are still some gray zones like database migrations. It is easier to daily rebase big feature branches onto master, IMO.