Post #1327916

2026-02-18 01:18 UTC

This is a joke, right? OneFlow isn’t trunk-based development and [is actually gitflow with different steps](https://www.endoflineblog.com/oneflow-a-git-branching-model-and-workflow#variation-develop-master). I have yet to see any org actually use [trunk-based development](https://trunkbaseddevelopment.com/) mostly because I’ve not seen [cherry-picking from the trunk](https://trunkbaseddevelopment.com/branch-for-release/) adopted at any large scale.

Replies (2)

@chunkystyles@sopuli.xyz 2026-02-18 05:32

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.

Open ##1327917
@draycs@lemmy.world 2026-02-18 07:16

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)

Open ##1327918