3 ms·
The article you referenced specifically says that “trunk-based development” is a synonym for “continuous integration.” Please see the section titled “What is th
by jdlshore 2y ago
The article you referenced specifically says that “trunk-based development” is a synonym for “continuous integration.” Please see the section titled “What is the difference between continuous integration and trunk-based development?”
- kspacewalk2 2y agoThat's a nice bit of history, but that is no longer common usage. Terminology has a life of its own, it isn't owned by those who first use it.
- 0xbadcafebee 2y agoMartin's only saying that because the idea of CI came first, and he "doesn't want to rudely erase the work of Kent Beck". Trunk-based development has the branching model in the name. CI doesn't; it refers to a method to integrate code, and a whole lot of practices, tools, etc. In practice, most people don't even use the trunk model for their CI. Most people use feature branches and PRs. They still use everything else from CI, except for the single-branch. What should we call that, then? Not-quite-CI CI? It's simpler to refer to the general idea as "CI", even if it doesn't use a single branch. If you want to refer to the strict single-branch method, "trunk-based development" makes it clear.
- steveklabnik 2y agoGitHub does have a setting in their branch rulesets to enforce linear history, it's kinda nice. But I agree with you that most people don't use it.