From 315fa23831af20b1e5d8147831c26e1291259fce Mon Sep 17 00:00:00 2001 From: Fabian Junkert Date: Fri, 24 May 2024 16:26:05 +0200 Subject: [PATCH] docs: fade out gitflow (#290) --- radar/2019-11-01/gitflow.md | 14 +++++++------- radar/2024-06-01/gitflow.md | 7 +++++++ 2 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 radar/2024-06-01/gitflow.md diff --git a/radar/2019-11-01/gitflow.md b/radar/2019-11-01/gitflow.md index 15f3dae..edd1403 100644 --- a/radar/2019-11-01/gitflow.md +++ b/radar/2019-11-01/gitflow.md @@ -2,17 +2,17 @@ title: "GitFlow" ring: hold 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. -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: -* trunk based development https://trunkbaseddevelopment.com/ -* https://medium.com/@fagnerbrack/one-commit-one-change-3d10b10cebbf -* https://martinfowler.com/bliki/FeatureBranch.html -* https://www.continuousdeliveryconsulting.com/blog/organisation-antipattern-build-feature-branching/ \ No newline at end of file +* [Trunk-Based Development](https://trunkbaseddevelopment.com/) +* [One Commit, One Change](https://medium.com/@fagnerbrack/one-commit-one-change-3d10b10cebbf) +* [Feature Branch](https://martinfowler.com/bliki/FeatureBranch.html) +* [Organisation Antipattern: Build Feature Branching](https://www.continuousdeliveryconsulting.com/blog/organisation-antipattern-build-feature-branching/) diff --git a/radar/2024-06-01/gitflow.md b/radar/2024-06-01/gitflow.md new file mode 100644 index 0000000..a5048d0 --- /dev/null +++ b/radar/2024-06-01/gitflow.md @@ -0,0 +1,7 @@ +--- +title: "GitFlow" +ring: hold +quadrant: methods-and-patterns +tags: [agile, coding, devops] +featured: false +---