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:43] garciaflores [Fixing a bug or adding a new feature] |
equipes:devteam:gitflow [2020/11/28 12:04] garciaflores |
||
---|---|---|---|
Ligne 1: | Ligne 1: | ||
- | ====== LIPN Git-flow | + | ====== LIPN Git-flow |
At # | At # | ||
===== Git flow installation and initialization ===== | ===== Git flow installation and initialization ===== | ||
Ligne 31: | Ligne 31: | ||
If you are fixing a bug from a project of LIPN's [[https:// | If you are fixing a bug from a project of LIPN's [[https:// | ||
```bash | ```bash | ||
- | $ git flow start bugfix bug31_bibtex_import | + | $ git flow bugfix |
``` | ``` | ||
+ | You should get the following answer from git flow: | ||
+ | ```javascript | ||
+ | Branches ' | ||
+ | And local branch ' | ||
+ | Basculement sur la nouvelle branche ' | ||
+ | |||
+ | Summary of actions: | ||
+ | - A new branch ' | ||
+ | - You are now on branch ' | ||
+ | |||
+ | Now, start committing on your bugfix. When done, use: | ||
+ | |||
+ | git flow bugfix finish bug55_arxiv_credentials_crash | ||
+ | ``` | ||
+ | |||
This will create a new branch called `bugfix31_bibtex_import` and switch your git to it. Afterwards you can commit and push as usual until you bug has been fixed. | This will create a new branch called `bugfix31_bibtex_import` and switch your git to it. Afterwards you can commit and push as usual until you bug has been fixed. | ||
Ligne 41: | Ligne 56: | ||
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 | ||
Énumération des objets: 26, fait. | Énumération des objets: 26, fait. | ||
Décompte des objets: 100% (26/26), fait. | Décompte des objets: 100% (26/26), fait. | ||
Ligne 62: | Ligne 78: | ||
- 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. | ||