AJR/TechradarDev
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

docs: fade out gitflow (#290)

Browse Source
This commit is contained in:
Fabian Junkert
2024-05-24 16:26:05 +02:00
committed by Stefan Rotsch
parent 231eda9e4e
commit 315fa23831
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
radar/2019-11-01/gitflow.md
View File

@@ -2,17 +2,17 @@
title: "GitFlow" title: "GitFlow"
ring: hold ring: hold
quadrant: methods-and-patterns quadrant: methods-and-patterns
tags: [devops, agile] tags: [agile, coding, devops]
--- ---
Ever since there are recurring discussions about the version control strategy that a team should use. Ever since there are recurring discussions about the version control strategy that a team should use.
We have also made the experience when new teams start off with using blocking or long-lived feature branches (merge late once all review comments are done) it has a negative impact on team performance. At AOE, we have also made the experience that when new teams start off using blocking or long-lived feature branches (merging late once all review comments are done), it has a negative impact on team performance.
We recommend to use trunk based development with short-lived (<1day) feature branches, because this has shown to support continuous integration and team collaboration the best. However, we do accept teams choices to use GitFlow, we just do not try to encourage them in the first place. We recommend using trunk-based development with short-lived (<1 day) feature branches because this has shown to support continuous integration and team collaboration the best. However, we do accept teams' choices to use GitFlow; we just do not try to encourage them in the first place.
See also: See also:
* trunk based development https://trunkbaseddevelopment.com/ * [Trunk-Based Development](https://trunkbaseddevelopment.com/)
* https://medium.com/@fagnerbrack/one-commit-one-change-3d10b10cebbf * [One Commit, One Change](https://medium.com/@fagnerbrack/one-commit-one-change-3d10b10cebbf)
* https://martinfowler.com/bliki/FeatureBranch.html * [Feature Branch](https://martinfowler.com/bliki/FeatureBranch.html)
* https://www.continuousdeliveryconsulting.com/blog/organisation-antipattern-build-feature-branching/ * [Organisation Antipattern: Build Feature Branching](https://www.continuousdeliveryconsulting.com/blog/organisation-antipattern-build-feature-branching/)

7
radar/2024-06-01/gitflow.md Normal file
View File

@@ -0,0 +1,7 @@
---
title: "GitFlow"
ring: hold
quadrant: methods-and-patterns
tags: [agile, coding, devops]
featured: false
---