Git flow in action
-
Upload
ceciliabossard -
Category
Software
-
view
2.943 -
download
2
Transcript of Git flow in action
![Page 1: Git flow in action](https://reader030.fdocuments.net/reader030/viewer/2022012402/55a636e01a28ab480f8b45f3/html5/thumbnails/1.jpg)
@ceciliaBossard#GitFlowInAction
GitFlow in action
![Page 2: Git flow in action](https://reader030.fdocuments.net/reader030/viewer/2022012402/55a636e01a28ab480f8b45f3/html5/thumbnails/2.jpg)
Objectifs
Découvrir Git et la gestion des branches avec GitFlow
![Page 3: Git flow in action](https://reader030.fdocuments.net/reader030/viewer/2022012402/55a636e01a28ab480f8b45f3/html5/thumbnails/3.jpg)
@ceciliaBossard#GitFlowInAction
Qui je suis ?
Cécilia Bossard
Développeuse agile
![Page 4: Git flow in action](https://reader030.fdocuments.net/reader030/viewer/2022012402/55a636e01a28ab480f8b45f3/html5/thumbnails/4.jpg)
@ceciliaBossard#GitFlowInAction
Plan
• Pourquoi passer à Git et pourquoi GitFlow ?
• Comment ça marche ?
• Hooks
![Page 5: Git flow in action](https://reader030.fdocuments.net/reader030/viewer/2022012402/55a636e01a28ab480f8b45f3/html5/thumbnails/5.jpg)
@YourTwitterHandle@YourTwitterHandle @ceciliaBossard#GitFlowInAction
Contexte
![Page 6: Git flow in action](https://reader030.fdocuments.net/reader030/viewer/2022012402/55a636e01a28ab480f8b45f3/html5/thumbnails/6.jpg)
@ceciliaBossard#GitFlowInAction
Le contexte
● Problème taille serveur SVN● Gestion des branches devenue complexe● Version stable à un instant t ?● Isolation de fonctionnalités
![Page 7: Git flow in action](https://reader030.fdocuments.net/reader030/viewer/2022012402/55a636e01a28ab480f8b45f3/html5/thumbnails/7.jpg)
@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
![Page 8: Git flow in action](https://reader030.fdocuments.net/reader030/viewer/2022012402/55a636e01a28ab480f8b45f3/html5/thumbnails/8.jpg)
@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
![Page 9: Git flow in action](https://reader030.fdocuments.net/reader030/viewer/2022012402/55a636e01a28ab480f8b45f3/html5/thumbnails/9.jpg)
@ceciliaBossard#GitFlowInAction
GitFlowSupport
Master
Hotfix
Release
Develop
Feature
Feature
![Page 10: Git flow in action](https://reader030.fdocuments.net/reader030/viewer/2022012402/55a636e01a28ab480f8b45f3/html5/thumbnails/10.jpg)
@YourTwitterHandle@YourTwitterHandle @ceciliaBossard#GitFlowInAction
Demo
![Page 11: Git flow in action](https://reader030.fdocuments.net/reader030/viewer/2022012402/55a636e01a28ab480f8b45f3/html5/thumbnails/11.jpg)
@ceciliaBossard#GitFlowInAction
Init
Master
git clone ...
![Page 12: Git flow in action](https://reader030.fdocuments.net/reader030/viewer/2022012402/55a636e01a28ab480f8b45f3/html5/thumbnails/12.jpg)
@ceciliaBossard#GitFlowInAction
Init GitFlow
Master
Develop
git flow init
![Page 13: Git flow in action](https://reader030.fdocuments.net/reader030/viewer/2022012402/55a636e01a28ab480f8b45f3/html5/thumbnails/13.jpg)
@ceciliaBossard#GitFlowInAction
1ère feature
Master
Develop
Feature
git flow feature start ...
![Page 14: Git flow in action](https://reader030.fdocuments.net/reader030/viewer/2022012402/55a636e01a28ab480f8b45f3/html5/thumbnails/14.jpg)
@ceciliaBossard#GitFlowInAction
2ème feature
Master
Develop
Feature
Feature
git flow feature start ...
![Page 15: Git flow in action](https://reader030.fdocuments.net/reader030/viewer/2022012402/55a636e01a28ab480f8b45f3/html5/thumbnails/15.jpg)
@ceciliaBossard#GitFlowInAction
Release
Master
Release
Develop
Feature
Feature
git flow release start ...
![Page 16: Git flow in action](https://reader030.fdocuments.net/reader030/viewer/2022012402/55a636e01a28ab480f8b45f3/html5/thumbnails/16.jpg)
@ceciliaBossard#GitFlowInAction
Release
Master
Release
Develop
Feature
Feature
git flow release start ...
![Page 17: Git flow in action](https://reader030.fdocuments.net/reader030/viewer/2022012402/55a636e01a28ab480f8b45f3/html5/thumbnails/17.jpg)
@ceciliaBossard#GitFlowInAction
Mise en prod
Master
Release
Develop
Feature
Feature
git flow release finish
![Page 18: Git flow in action](https://reader030.fdocuments.net/reader030/viewer/2022012402/55a636e01a28ab480f8b45f3/html5/thumbnails/18.jpg)
@ceciliaBossard#GitFlowInAction
HotfixMaster
Hotfix
Release
Develop
Feature
Feature
git flow hotfix start ...
![Page 19: Git flow in action](https://reader030.fdocuments.net/reader030/viewer/2022012402/55a636e01a28ab480f8b45f3/html5/thumbnails/19.jpg)
@ceciliaBossard#GitFlowInAction
SupportSupport
Master
Hotfix
Release
Develop
Feature
Feature
git flow support start ...
![Page 20: Git flow in action](https://reader030.fdocuments.net/reader030/viewer/2022012402/55a636e01a28ab480f8b45f3/html5/thumbnails/20.jpg)
@ceciliaBossard#GitFlowInAction
Que devient feature2 ?Support
Master
Hotfix
Release
Develop
Feature
Feature
git rebase develop
![Page 21: Git flow in action](https://reader030.fdocuments.net/reader030/viewer/2022012402/55a636e01a28ab480f8b45f3/html5/thumbnails/21.jpg)
@ceciliaBossard#GitFlowInAction
GitFlowSupport
Master
Hotfix
Release
Develop
Feature
Feature
![Page 22: Git flow in action](https://reader030.fdocuments.net/reader030/viewer/2022012402/55a636e01a28ab480f8b45f3/html5/thumbnails/22.jpg)
@YourTwitterHandle@YourTwitterHandle @ceciliaBossard#GitFlowInAction
Hooks
![Page 23: Git flow in action](https://reader030.fdocuments.net/reader030/viewer/2022012402/55a636e01a28ab480f8b45f3/html5/thumbnails/23.jpg)
@ceciliaBossard#GitFlowInAction
HooksPetits scripts exécutés lors de certaines actions
● applypatch-msg● pre-commit● prepare-commit-msg● post-commit● post-receive● ...
![Page 24: Git flow in action](https://reader030.fdocuments.net/reader030/viewer/2022012402/55a636e01a28ab480f8b45f3/html5/thumbnails/24.jpg)
@ceciliaBossard#GitFlowInAction
Hooks
Exemples :
● Incrémentation auto des numéros de version● Appel d'une URL● ...
![Page 25: Git flow in action](https://reader030.fdocuments.net/reader030/viewer/2022012402/55a636e01a28ab480f8b45f3/html5/thumbnails/25.jpg)
@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
![Page 26: Git flow in action](https://reader030.fdocuments.net/reader030/viewer/2022012402/55a636e01a28ab480f8b45f3/html5/thumbnails/26.jpg)
@YourTwitterHandle@YourTwitterHandle @ceciliaBossard#GitFlowInAction
Q & A