Différences
Ci-dessous, les différences entre deux révisions de la page.
Prochaine révision | Révision précédente Prochaine révision Les deux révisions suivantes | ||
equipes:devteam:gitflow [2020/11/27 16:42] garciaflores créée |
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 40: | Ligne 40: | ||
``` | ``` | ||
Of course, instead of `bug31_bibtex_import` you will type the name of the bug you are fixing. You should get the following result, if everything works fine: | Of course, instead of `bug31_bibtex_import` you will type the name of the bug you are fixing. You should get the following result, if everything works fine: | ||
+ | |||
+ | < | ||
```bash | ```bash | ||
Énumération des objets: 26, fait. | Énumération des objets: 26, fait. | ||
Ligne 61: | Ligne 63: | ||
- The local branch ' | - The local branch ' | ||
- You are now on branch ' | - You are now on branch ' | ||
- | ``` | + | ``` |
+ | </ | ||
Finally, you have to open the URL indicated after the "//To create a merge request for bugfix/ | Finally, you have to open the URL indicated after the "//To create a merge request for bugfix/ | ||
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. | ||