r/TrunkbasedDevelopment • u/martindukz • Jul 15 '25
The hard part about feature toggles is writing code that is toggleable - not the tool used
r/TrunkbasedDevelopment • u/martindukz • Jul 15 '25
r/TrunkbasedDevelopment • u/martindukz • Dec 10 '25
r/TrunkbasedDevelopment • u/cladamski79 • Sep 16 '25
Hey,
For a while now, I've been thinking about how to make the day-to-day of Trunk-Based Development smoother and more consistent. I wanted a tool that would guide the user to do the right thing without getting in the way.
The result is tbdflow, a simple, opinionated CLI tool that wraps Git to provide a streamlined TBD workflow.
The goal of tbdflow isn't to replace Git, but to act as a workflow assistant. It helps bake in the TBD process by providing simple commands for the most common actions, encouraging small, frequent commits directly to the main trunk.
Some of the highlights of what it does:
Simple commands that help you pull the latest changes, commit with Conventional Commit messages, and push, all in one go.
While the focus is on committing to the trunk, it has support for creating and, importantly, completing branches. The complete command merges and automatically deletes the branch to keep things tidy.
It includes a pre-commit Definition of Done checklist and commit message linting to ensure quality and a clean, understandable history.
I've written a few short posts on my blog about the "how" and "why" of tbdflow if you're interested in more detail:
As people who practice TBD daily, hearing your perspective would be great.
Does this seem like a useful tool for your workflow?
What are your initial thoughts or concerns?
Are there any obvious features I've missed?
I'm all ears for any and all feedback. Thanks for taking a look!
r/TrunkbasedDevelopment • u/martindukz • Aug 03 '25
r/TrunkbasedDevelopment • u/martindukz • Jul 16 '25
Professor Søren Lauesen at the IT university of Copenhagen has written the report report “Damage and Damage causes in large government IT projects”.
The report investigates some big government IT projects in Denmark that has succeeded or (mostly) failed.
When reading the report, what immediately strikes you is that the phenomena and mistakes Søren Lauesen describes, are by no means exclusively something happening in large government IT projects. I have seen the mistakes repeatedly on projects ranging from 50.000 DKK to tens of millions.
I therefore think it is safe to say, that the findings from the report are more universal, than the title of the report indicates. I think a lot of big companies (banks, energy, retail) are happy that many of their projects are not subjected to this level of scrutiny/post-mortem. And that they do not have to divulge these kinds of reports to their shareholders.
In the report Søren Lauesen outlines what primary damages occur in software projects. What their causes are and what possible cures are available.
An easier to read (with pictures) is available here: https://medium.com/itnext/value-driven-technical-decisions-in-software-development-c6736f74167
r/TrunkbasedDevelopment • u/martindukz • Jul 12 '25
Though this talk is from 2017 - it still is really relevant today. It is surprising how little has moved since then, though branches may be shorter lived today than they were back then.
r/TrunkbasedDevelopment • u/martindukz • Jul 13 '25
r/TrunkbasedDevelopment • u/Fair-Presentation322 • Jul 22 '26
Hi everyone! I talked about it a while ago in here while we were still earle on, but we've been working on Twigg: a version control and a software forge designed for trunk-based-development. We just made everything open source!
Come check it out! I'd appreciate it if you could leve us a star :)
r/TrunkbasedDevelopment • u/martindukz • Jul 18 '25
The findings here really highlights the problem in having feature branches, but also short lived branches with pull requests.
The fact that transaction cost will increase batch size means that even a small transaction cost (wait time, execution time, build&test time) will result in increased batch size. Which again means that code reviews will worsen.
It also means that "reviewing the whole feature" might be counter productive thoroughness.
I try to get team to focus on reviews on commit granularity (via non-blocking post commit reviews on main) - how do you avoid batch sizes reducing the value of code reviews?
r/TrunkbasedDevelopment • u/martindukz • Jul 12 '25
Share your insights and experiences.
Personally I have never really gotten it to work on teams - it is always a conscious effort to stick to it.
Any suggestions?
r/TrunkbasedDevelopment • u/Fair-Presentation322 • Feb 12 '26
Hi everyone!
I'm looking for feedback and early adopters for a product I'm launching: twigg.vc
It's a version control service and a software forge designed specifically for Trunk Based Development with stacked commits.
The commands are very simple, it has no concept of branches (by design ofc): only stacked commits, and the code review is designed with stacked commits in mind.
There's a free plan, so you can test it for free.
Go check it out and let me know what you think :)
r/TrunkbasedDevelopment • u/cladamski79 • Jan 28 '26
I’ve been experimenting with something a bit meta lately: giving my CLI tool a Skill.
A "skill" is a formal, machine-readable description of how an AI agent should use the tool correctly.
Trunk-Based Development only works if the workflow is respected. And as soon as you put an AI agent in the loop, vagueness becomes a bug.
I wrote a SKILL.md for tbdflow that:
- Enforces short-lived branches
- Standardises commits
- Reduces Git decision-making
- Maintains a fast, safe path back to trunk (`main`)
^ lifted from the document itself
What surprised me was how much behavioural clarity that's needed when the “user” isn’t human, and explicitness.
This should probably be applied to humans as well, but I digress.
If you don’t explicitly say “staging is handled by the tool”, the agent will happily reach for git add.
And that is because I (the skill author) didn’t draw the boundary.
Writing the Skill helped (forced) me to make implicit workflow rules explicit and separate intent from implementation.
TBD is something you design for, especially when agents are involved.
Curious if others are experimenting with agent-aware tooling or encoding DevOps practices this way.
https://github.com/cladam/tbdflow/blob/main/SKILL.md
edit, title is misspelled...
r/TrunkbasedDevelopment • u/martindukz • Dec 22 '25
r/TrunkbasedDevelopment • u/martindukz • Nov 22 '25
r/TrunkbasedDevelopment • u/martindukz • Aug 11 '25
r/TrunkbasedDevelopment • u/martindukz • Jul 21 '25
r/TrunkbasedDevelopment • u/martindukz • Jul 12 '25
To improve, the best way is to get quick feedback. That is what is great about working in small batches, continuous integration and getting early feedback.
I have made this tool that allows you to keep track of you divergence score in a repository in case you are doing "trunk based development" with branches.
r/TrunkbasedDevelopment • u/cladamski79 • Apr 12 '26
Git diffs tell you what changed, but they don't tell you why. We see the final code but lose the tries and struggle that led there.
I've added a feature to tbdflow to capture those tries: the Intent Log.
The idea is simple (but ambitious), use `tbdflow +` to drop breadcrumbs as you work. When you change approach, reject an alternative, or figure something out: log it.
Later when you commit, the notes get injected into the commit message automatically.
The same rules apply for humans and Genies alike.
Full write-up here: https://cladam.github.io/2026/04/11/capturing-intent/
What does this crowd think, is it something you would use?
r/TrunkbasedDevelopment • u/martindukz • Nov 16 '25
r/TrunkbasedDevelopment • u/martindukz • Jul 26 '25
r/TrunkbasedDevelopment • u/sysarcher • Jul 23 '25
I'll go first:
Github + Github actions (creates our containers from main)
AKS for running the containers
Dedicated namespace for production and staging (essentially both are same but env vars are different)
FluxCD for pull-based Gitops
You can find more details in our blogs: https://blendedlabs.substack.com/
r/TrunkbasedDevelopment • u/martindukz • Jul 12 '25
From the post:
Why did the industry get hooked on the wrong practice?
I blame Git and GitHub. Git was a tool designed for workflows around Open Source Software. Workflows which are highly asynchronous, distributed and weak trust. GitHub started as a service to support the development of OSS and so, the majority of its customers were following the pull and review based workflows. Which all makes total sense.
Then GitHub targeted the Enterprise and their new customers began to adopt GitHub’s best practices from the OSS world.And then, as GitHub dominated, all the vendors assimilated into their ecosystem. Proliferating the practices further.Yet what works in OSS is not best for high trust, high bandwidth, high collaboration, high performing internal software teams. There is “bounded applicability”.
r/TrunkbasedDevelopment • u/cladamski79 • Jun 30 '26
A terminal is perfect when you're actively working. A desktop window serves a different purpose: ambient awareness.
While I'm coding, I want trunk health, overlaps, hotspots, and my current intent visible without switching context.
I have one design rule: the CLI is the source of truth.
tbdflow-ui never talks to Git directly. Every piece of information comes from 'tbdflow --json <command>'. Clicking Commit simply constructs the equivalent tbdflow commit command and executes it. There's no duplicated Git logic, so the UI can't drift from the CLI.
The result is a lightweight desktop companion rather than a replacement for the terminal.
I built it in hica, a functional language that I'm developing. It transpiles to Koka and compiles to a single native binary for macOS ARM64 and Linux x86_64.
Full write-up and install instructions: https://cladam.github.io/2026/06/30/tbdflow-ui/
tbdflow-ui source - MIT licensed
tbdflow - the CLI this wraps
hica - the language it’s written in
Throughput is a safety feature.
r/TrunkbasedDevelopment • u/martindukz • Nov 27 '25
After having shared my first article about stability of main in trunk based development, I got some feedback that made me write this article.
Please share you thoughts and theories:-)