What branching methodology do you use and why? We've been using a trunk based development model, but I'm reviewing others.

I'm the laziest git user on the planet. I don't have a system. I hope an answer here will inspired me to get some fucking discipline in my life.

@platypus And the secret is: *drumroll* toooot! No secret! You're going to have to put up with stuff that's unpleasant to do and also make it your routine. So now you know.. that whenever something seems boring and too much work, that's the thing to go for.

I like gitflow, master, develop, feature branches

We keep it simple. Working on master most of the time for small things, feature branches for more extensive things, and tags on master for releases.

Make own branch for changes -> Merge to development branch -> gets mered to master branch when production deployment pipeline runs

Main bus, then city blocks.
Wait, not factorio? 🙁

Git:
(features) -> dev -> staging* -> master -> production*

* These autodeploy to CI, then their respective environments

@Root mine is similar except no staging. But production fixes constantly require the codebase to be merged back and forth. I keep telling them that if the bug doesn't present itself in our dev environment, we need to focus on making the dev environment the same as production.

@arcsector No staging?! 😯

That's your missing step. Staging and production should be as identical as possible (just with different data). That way you can find most production issues before users ever touch your code.

@Root "there's no budget"
"Well we can't fix all the bugs, we still need that feature request to hit tomorrow!"
"What do you mean 'integration tests will save us money'? That's time when you could be sprinting!"
Dont worry im trying over here.

@arcsector But but. It's cheap? And prevents bugs?
☹ I don't know what those business nubs are thinking.