🪵 Transition to Trunk-Based Development

[untoldengine]

Hey everyone,

After spending some time dealing with repeated merge conflicts between develop and master, I’ve realized that our current Git-Flow branching model isn’t serving us well anymore. It’s become difficult to keep our branches — and more importantly, our documentation — in sync.

To simplify things and better align our tooling with how we actually work, we’re switching to a Trunk-Based Development model.

---

🔄 What’s Changing

• develop becomes the main trunk
  This will be our default branch going forward.
  All feature branches will branch off develop and merge back into it. (Business as usual - here)

• master will be deprecated
  We won’t maintain a separate master line anymore.
  There’s no need to manage release merges between develop and master.

• Releases will be defined by tags
  Instead of merging to master, we’ll create a tag (e.g., v0.4.0) on the current develop commit when we’re ready to release.
  That tag will serve as the snapshot for documentation, changelogs, and builds.

• Documentation versioning will be tied to release tags
  This ensures the live docs always reflect the latest stable release, while the develop branch continues to host the “Next” (in-progress) docs.
  No more out-of-sync versions!

---

✅ Why This Works Better for Us

• Simpler workflow – One permanent branch (develop), one source of truth.
• Docs stay accurate – We only version the docs when a real release tag exists.
• No conflict headaches – We eliminate the constant back-merging between master and develop.
• Faster iteration – Contributors can always pull develop to get the most up-to-date features and fixes.

---

🚀 Summary

We’re moving to a Trunk-Based Development flow, where develop acts as the mainline and tags represent official releases.
This approach matches our current pace of development and keeps the documentation, releases, and codebase in perfect sync.

Thanks to everyone for adapting to this change — it’ll make our workflow cleaner, faster, and more predictable in the long run.

– Harold

[miogds]

I like more this approach. Usually I work in the same way with the master / main branch.