equipes:devteam:gitflow

Différences

Ci-dessous, les différences entre deux révisions de la page.

Lien vers cette vue comparative

Les deux révisions précédentes Révision précédente
equipes:devteam:gitflow [2020/11/28 12:06]
garciaflores
equipes:devteam:gitflow [2020/11/28 12:23] (Version actuelle)
garciaflores [Fixing a bug or adding a new feature]
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://depot.lipn.univ-paris13.fr/etamine/plugins/publications/-/merge_requests|to the git lab to make the merge request]] of your branch, you have to pay attention to ask for a merge with `develop` branch: 
 +{{:equipes:devteam:screenshot_20201128_132021.png?400|}}
  
  
  • Dernière modification: il y a 3 ans