21 lines
862 B
Markdown
21 lines
862 B
Markdown
---
|
|
title: "GitFlow"
|
|
ring: hold
|
|
quadrant: methods-and-patterns
|
|
|
|
---
|
|
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.
|
|
|
|
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.
|
|
|
|
|
|
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/ |