I always used Git Flow but I would like to try Trunk Based workflow. Has someone experiences with this type of work flow?

Have you seen https://trunkbaseddevelopment.com/?

nice link!

I moved my org from gitflow to trunk-based a few years back. No regrets.

+1 Trunk based dev

In my experience, to convince a team to do TBD is one of the hardest thing to do

@Luca Carangella what are the reasons? It seems a simplier flow and it force you to make properly tests

I totally agree with you, but lots of people are still not familiar with it, and who is, usually thinks is more complicated to reason about. The biggest struggle is to breakdown the work in smaller chunks of work. It is easier for people to take a ticket and work on it for days, if not weeks without the extra work required to break things down. I didn't give up the idea just yet though 🙂

Also interested if there’s a course available online that we could use

I'm transitioning my team as well to TBD. We are pretty small and people aren't exactly used yet, and more advanced concepts like abstraction based branching are out of reach at the moment, but until now everything is going smoothly. I also spent some time on a github action script that checks what branch you are pushing from. For example, the main branch deploys to the dev environment, feature branches deploy to a custom domain with the branch name but will use development environment backend (only on frontend at the moment as backend is not really viable financially in my opinion) and branches with

release/${production/staging}/${v1/v2/etc}

will deploy to staging/production respectively. There's still room to improve and I'm interested in how others are doing, but it's a starting point!

My suggestion is don't use release branches ever. It's pretty much antithetical to trunk-based development.

Its not too difficult, but you need a good feature flags system that everyone knows how to use.

Very good point @Gjorgji Kjosev, I agree 100%. Do you have a favourite one? I mean, do you have any feature flags system you would highly recommend?

I've had reasonable results with Unleash, but IDK if it fits a serverless workflow very well. Haven't used one for severless yet blush

I've been using LaunchDarkly for years. It's a very solid product that fits with a variety of architectures.

Thank you @Matt Morgan and @Gjorgji Kjosev. I do know them both, but I have direct little experience only with Unleash. I am glad to hear from you @Matt Morgan about your positive experience with LaunchDarkly because we are planning on investigating it. Thank you both for sharing

any experiences with AWS AppConfig? It supports feature toggle

@Matt Morgan hmm ok, how do you do it? I've followed the idea from trunkbaseddevelopment.com, where you push constantly on main and releases go on a release branch and any fixes are cherry picked from main if needed, but those branches shouldn't see any development activity per se

Why do you need release branches? Just deploy main.

for us, we only really managed to stop using release branches when we started using feature flags for pretty much everything spanning > 1 PR