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 | ||
equipes:devteam:gitflow [2020/11/28 12:04] garciaflores |
equipes:devteam:gitflow [2020/11/28 12:23] (Version actuelle) garciaflores [Fixing a bug or adding a new feature] |
||
---|---|---|---|
Ligne 37: | Ligne 37: | ||
Branches ' | Branches ' | ||
And local branch ' | And local branch ' | ||
- | Basculement sur la nouvelle branche ' | + | Basculement sur la nouvelle branche ' |
Summary of actions: | Summary of actions: | ||
- | - A new branch ' | + | - A new branch ' |
- | - You are now on branch ' | + | - You are now on branch ' |
Now, start committing on your bugfix. When done, use: | Now, start committing on your bugfix. When done, use: | ||
- | git flow bugfix | + | git flow bugfix |
``` | ``` | ||
Ligne 85: | Ligne 85: | ||
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. | + | 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. When you go [[https:// |
+ | {{: | ||