aboutcode-org / aboutcode-org/scancode-toolkit

Simplify branching model

Ouverte
#2,203 2 commentaires 1 réaction 0 personnes assignées Voir sur GitHub
development environment new feature
Langage dominant
Python
Étoiles
2.6k
Forks
791
Merge moyen
1 j 12 h
PR mergées (30 j)
5

Description

We de-facto use the gitflow branching model at https://nvie.com/posts/a-successful-git-branching-model/
BUT the "master/develop" branches are making double duty and serve not purpose.
In practice all the code merged in develop is immediately usable in production.
Therefore I suggest we switch to a simpler branching model which is the de facto model we use today:
1. one single default branch called "main" where only merges are done
2. features are pushed in other branches and merged when fully ready in "main"
3. now and then we tag and cut a formal release from "main"
4. exceptionally and likely never we can branch from a tag to backport a hotfix just there

Guide de contribution

Ouvrir le guide de contribution

Évaluation

Cette issue n'a pas encore été évaluée.

Recevez les nouvelles issues par e-mail

Un résumé court des issues GitHub adaptées aux débutants.