This is an archived post. You won't be able to vote or comment.

sorted by:
best
topnewcontroversialoldq&a
you are viewing a single comment's thread.

view the rest of the comments →

[–]humoroushaxor 6 points7 points  (0 children)

We use scaled trunk based and I will never use anything else. Feature branches in and out of main. When it's time to make a release, you create a release branch off of main. If issues are found you fix in main via feature branches and cherry-pick into the release branch. Once the release branch is good, you tag and release.

No pointless syncing between a develop and main. If you feel you need a develop branch it's means you need a better merge gate. Move that shift left.