That works, until that inevitable one merge that's harder to fix and takes longer, which in my experience then tends to snowball until it's basically the very merge hell you were trying to avoid. Can't say I've ever had a great experience with long lived feature branches. I can't imagine what it would even look like trying to do this on such a massive project and such an overarching feature.
Comments
Nah, you just merge main back every day or so.
That works, until that inevitable one merge that's harder to fix and takes longer, which in my experience then tends to snowball until it's basically the very merge hell you were trying to avoid. Can't say I've ever had a great experience with long lived feature branches. I can't imagine what it would even look like trying to do this on such a massive project and such an overarching feature.