Timeline for What is the difference between trunk based development and gitflow?
Current License: CC BY-SA 4.0
11 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Apr 12, 2024 at 16:56 | comment | added | Chris O | Thanks, nice answer. Just want to emphasize the massive utility of Feature toggles, have used extensively with DevOps TFS, but will continue use when we move to git. | |
| Jul 12, 2023 at 15:42 | comment | added | Greg Burghardt |
@Pacerier: I've come back to your comment several times now. It's difficult for me to understand what examples would be useful for this answer. The difference between GitFlow and trunk-based development is not so much "how to use Git" or "how git log looks". The difference is philosophical. You need to understand both GitFlow and trunk-based development before you can understand the philosophical differences. Although, if you have an idea for some examples, I would be happy to include it in my answer.
|
|
| Jun 4, 2023 at 23:23 | comment | added | Pacerier | @GregBurghardt, how could an answer to this question not have any examples? | |
| Dec 19, 2022 at 14:04 | comment | added | RoboShop | Thanks Greg - I understand your point now and appreciate the differences between what is considered a feature in TBD and GF - that to me seems like the biggest difference and in many ways, makes these two methodologies almost two sides of a spectrum - like a project team may not solely be in the TBD or GF camp but might be leaning towards having task or story based feature branches and those factors could be dependent greatly on the domain and the problemset it's operating in. | |
| Dec 19, 2022 at 13:36 | comment | added | Greg Burghardt | @RoboShop: I updated my answer with information about how the term "feature branch" is used differently in each situation. | |
| Dec 19, 2022 at 13:36 | history | edited | Greg Burghardt | CC BY-SA 4.0 |
Clarified meaning of "feature branches"
|
| Dec 19, 2022 at 13:26 | comment | added | Greg Burghardt | Ok, I'm seeing the misunderstanding now. The term "feature branch" is used in trunk-based development to mean "not the main branch". Let me update my answer in a little bit. | |
| Dec 19, 2022 at 13:23 | comment | added | RoboShop | Ah ok, so when I mean feature branch, I'm talking about whenever I'm implementing a new user story or fixing a bug, I'll do it in a "feature" branch before PRing it into the main or release branch. Is that what you are meaning too? Cause my understanding of that is that in trunk development, you would do that too and therefore if you have multiple feature branches by multiple devs, the chances of a merge conflict would be the same? | |
| Dec 19, 2022 at 13:16 | comment | added | Greg Burghardt | @RoboShop: you might be getting confused by the term "feature branch". This does not imply the branch lives a long time. It implies it is not the main branch. | |
| Dec 19, 2022 at 13:15 | comment | added | RoboShop | Thanks but I still don't understand why this statement is true - "Branches tend to live longer in Gitflow simply because it is more permissible to create longer-lived branches" since feature branches exist and is used in trunk-based development. I also don't see why trunk based development's version control is simpler. It's simply using tags in place of branches. But they're both just used as markers to mark a significant development event (eg. like the last prod release) | |
| Dec 19, 2022 at 12:50 | history | answered | Greg Burghardt | CC BY-SA 4.0 |