Transcript
@ceciliaBossard#GitFlowInAction
GitFlow in action
Objectifs
Découvrir Git et la gestion des branches avec GitFlow
@ceciliaBossard#GitFlowInAction
Qui je suis ?
Cécilia Bossard
Développeuse agile
@ceciliaBossard#GitFlowInAction
Plan
• Pourquoi passer à Git et pourquoi GitFlow ?
• Comment ça marche ?
• Hooks
@YourTwitterHandle@YourTwitterHandle @ceciliaBossard#GitFlowInAction
Contexte
@ceciliaBossard#GitFlowInAction
Le contexte
● Problème taille serveur SVN● Gestion des branches devenue complexe● Version stable à un instant t ?● Isolation de fonctionnalités
@ceciliaBossard#GitFlowInAction
Pourquoi passer de SVN à Git ?
● Problème taille serveur SVN● Gestion des branches devenue complexe● Version stable à un instant t ?● Isolation de fonctionnalités
@ceciliaBossard#GitFlowInAction
Pourquoi passer de SVN à GitFlow ?
● Problème taille serveur SVN● Gestion des branches devenue complexe● Version stable à un instant t ?● Isolation de fonctionnalités
@ceciliaBossard#GitFlowInAction
GitFlowSupport
Master
Hotfix
Release
Develop
Feature
Feature
@YourTwitterHandle@YourTwitterHandle @ceciliaBossard#GitFlowInAction
Demo
@ceciliaBossard#GitFlowInAction
Init
Master
git clone ...
@ceciliaBossard#GitFlowInAction
Init GitFlow
Master
Develop
git flow init
@ceciliaBossard#GitFlowInAction
1ère feature
Master
Develop
Feature
git flow feature start ...
@ceciliaBossard#GitFlowInAction
2ème feature
Master
Develop
Feature
Feature
git flow feature start ...
@ceciliaBossard#GitFlowInAction
Release
Master
Release
Develop
Feature
Feature
git flow release start ...
@ceciliaBossard#GitFlowInAction
Release
Master
Release
Develop
Feature
Feature
git flow release start ...
@ceciliaBossard#GitFlowInAction
Mise en prod
Master
Release
Develop
Feature
Feature
git flow release finish
@ceciliaBossard#GitFlowInAction
HotfixMaster
Hotfix
Release
Develop
Feature
Feature
git flow hotfix start ...
@ceciliaBossard#GitFlowInAction
SupportSupport
Master
Hotfix
Release
Develop
Feature
Feature
git flow support start ...
@ceciliaBossard#GitFlowInAction
Que devient feature2 ?Support
Master
Hotfix
Release
Develop
Feature
Feature
git rebase develop
@ceciliaBossard#GitFlowInAction
GitFlowSupport
Master
Hotfix
Release
Develop
Feature
Feature
@YourTwitterHandle@YourTwitterHandle @ceciliaBossard#GitFlowInAction
Hooks
@ceciliaBossard#GitFlowInAction
HooksPetits scripts exécutés lors de certaines actions
● applypatch-msg● pre-commit● prepare-commit-msg● post-commit● post-receive● ...
@ceciliaBossard#GitFlowInAction
Hooks
Exemples :
● Incrémentation auto des numéros de version● Appel d'une URL● ...
@ceciliaBossard#GitFlowInAction
Installation● Git :
http://git-scm.com/downloads● Git Flow (AVH edition) :
https://github.com/petervanderdoes/gitflow● Git flow hooks :
https://github.com/jaspernbrouwer/git-flow-hooks
@YourTwitterHandle@YourTwitterHandle @ceciliaBossard#GitFlowInAction
Q & A
top related