Différences
Ci-dessous, les différences entre deux révisions de la page.
Les deux révisions précédentes Révision précédente Prochaine révision | Révision précédente Prochaine révision Les deux révisions suivantes | ||
equipes:devteam:gitflow [2020/11/27 16:45] garciaflores [Fixing a bug or adding a new feature] |
equipes:devteam:gitflow [2020/11/27 19:00] garciaflores |
||
---|---|---|---|
Ligne 1: | Ligne 1: | ||
- | ====== LIPN Git-flow | + | ====== LIPN Git-flow |
At # | At # | ||
===== Git flow installation and initialization ===== | ===== Git flow installation and initialization ===== | ||
Ligne 69: | Ligne 69: | ||
If instead or fixing a bug you want to add a new feature, you just need to follow the same method, replacing the `bugfix` keyword for `feature` in every one of the above `git flow` commands. | If instead or fixing a bug you want to add a new feature, you just need to follow the same method, replacing the `bugfix` keyword for `feature` in every one of the above `git flow` commands. | ||
+ | |||
+ | If you want to continue with the next bug before the merge has been realized, you need to checkout `develop` again, and then restart the whole flow. | ||