347
Morge continvoucly (thelemmy.club)
submitted 7 months ago by to c/programmer_humor@programming.dev
52 comments fedilink hide all child comments
 

This was from official Microslop documentation https://web.archive.org/web/20260216165612/https://learn.microsoft.com/en-us/training/modules/introduction-to-github/3-components-of-github-flow

you are viewing a single comment's thread
view the rest of the comments
[–] 4 points 7 months ago (3 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.

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 3 child comments
    •
  • [–] 5 points 7 months ago (1 child)

    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.

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 1 child comment
    •
  • [–] 3 points 7 months 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)

  • permalink
  • fedilink
  • source
  • parent