Use a branching model
Description:
According to your needs (team size, development and deployment strategy), choose one of the branching models, explain it to your team and make every developer to do following the principals.
Links:
https://nvie.com/posts/a-successful-git-branching-model/
https://www.atlassian.com/git/tutorials/comparing-workflows
https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow
https://www.atlassian.com/git/tutorials/comparing-workflows/forking-workflow
https://www.atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow
https://docs.gitlab.com/ee/topics/gitlab_flow.html
https://docs.github.com/en/get-started/quickstart/github-flow
https://git-scm.com/book/en/v2/Git-Branching-Branching-Workflows
https://en.wikipedia.org/wiki/Feature-driven_development
Keywords:
git, branching model, version control
Motivation:
When your team grows up and your projects has multiple active developers at the same time, branching model helps with preventing merge conflicts and unifies the process of publishing new code.
Requirements/Prerequisities:
git
Level:
concret: specific best practice (e.g. use microservice)
Application domain:
Software engineering
Main phase:
Development: Implementation/Code/Build
Related literature:
Fowler, M. (2020, May 7). Bliki: Featurebranch. martinfowler.com. Retrieved December 21, 2022, from https://martinfowler.com/bliki/FeatureBranch.html
In which projects do/did you use this practice?
Publishing COVID graphs and visualizations, publishing of a new web
Full-stack Developer
3–5 years of experiences
Masaryk University
1. How do you rate the potential benefit for your projects? | 5 |
2. How often are you using that practice? | 5 |
3. What is the effort to introduce the practice in your project upfront? | 2 |
4. What is the effort to apply the best practice in your project daily basis? | 5 |
Questions 1, 3 and 4 (1 = Low, 5 = High)
Question 2 (1 = Never, 5 = Always)