It's an atrocious, pointlessly complicated system resulting in convoluted project histories prone to confusion. Trunk-based development with sensible tags of releases & hotfixes achieves the same thing without the junk complexity. Git flow isn't overkill, it's just ill-conceived.

[–] thesmokingman@programming.dev 3 points 16 hours ago (2 children)

This is a joke, right? OneFlow isn’t trunk-based development and is actually gitflow with different steps. I have yet to see any org actually use trunk-based development mostly because I’ve not seen cherry-picking from the trunk adopted at any large scale.

[–] draycs@lemmy.world 3 points 10 hours ago

What is large scale to you? We have 100-200 developers doing something fairly close to trunk based development. Including cherry picking from trunk when possible (not always practical for sufficiently old release branches)

[–] chunkystyles@sopuli.xyz 4 points 12 hours ago

I pushed my team to use trunk based development. We did cherry-picks from trunk to release branches for a couple years with no issues. Since then, I've written a GitHub action that automates the cherry-picks based on tickets in the commit messages.

But even before the automation, it drastically improved our dev processes.

We weren't on Git Flow exactly, but it was a bastardized version of it.

Having used TBD successfully for like 5-6 years now. I can't imagine using Git Flow.