One topic that comes back constantly is git branching models. It’s no secret that I don’t like GitFlow, and generally advocate using trunk-based development (TBD) instead. But there are a few cases where TBD isn’t enough, and I want to talk about a couple of them.
Both of these examples come from open-source work. Although the first one can apply to a wide number of products, the second one will be extremely rare.
Long-term support releases
Following a versioned spec
So there you have it. I’m on record admitting that I don’t always use TBD, I sometimes use long-lived branches, and I sometimes even share an in-progress branch with other developers. All practices I regularly preach against. Even the best rules have a time and place to be broken, I guess. :)
If you enjoyed this message, subscribe to The Daily Commit to get future messages to your inbox.
Top comments (0)