Top Banner
@ceciliaBossard #GitFlowInAction GitFlow in action
26

Git flow in action

Jul 15, 2015

Download

Software

cecilia_bossard
Welcome message from author
This document is posted to help you gain knowledge. Please leave a comment to let me know what you think about it! Share it to your friends and learn new things together.
Transcript
Page 1: Git flow in action

@ceciliaBossard#GitFlowInAction

GitFlow in action

Page 2: Git flow in action

Objectifs

Découvrir Git et la gestion des branches avec GitFlow

Page 3: Git flow in action

@ceciliaBossard#GitFlowInAction

Qui je suis ?

Cécilia Bossard

Développeuse agile

Page 4: Git flow in action

@ceciliaBossard#GitFlowInAction

Plan

• Pourquoi passer à Git et pourquoi GitFlow ?

• Comment ça marche ?

• Hooks

Page 5: Git flow in action

@YourTwitterHandle@YourTwitterHandle @ceciliaBossard#GitFlowInAction

Contexte

Page 6: Git flow in action

@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

@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

@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

@ceciliaBossard#GitFlowInAction

GitFlowSupport

Master

Hotfix

Release

Develop

Feature

Feature

Page 10: Git flow in action

@YourTwitterHandle@YourTwitterHandle @ceciliaBossard#GitFlowInAction

Demo

Page 11: Git flow in action

@ceciliaBossard#GitFlowInAction

Init

Master

git clone ...

Page 12: Git flow in action

@ceciliaBossard#GitFlowInAction

Init GitFlow

Master

Develop

git flow init

Page 13: Git flow in action

@ceciliaBossard#GitFlowInAction

1ère feature

Master

Develop

Feature

git flow feature start ...

Page 14: Git flow in action

@ceciliaBossard#GitFlowInAction

2ème feature

Master

Develop

Feature

Feature

git flow feature start ...

Page 15: Git flow in action

@ceciliaBossard#GitFlowInAction

Release

Master

Release

Develop

Feature

Feature

git flow release start ...

Page 16: Git flow in action

@ceciliaBossard#GitFlowInAction

Release

Master

Release

Develop

Feature

Feature

git flow release start ...

Page 17: Git flow in action

@ceciliaBossard#GitFlowInAction

Mise en prod

Master

Release

Develop

Feature

Feature

git flow release finish

Page 18: Git flow in action

@ceciliaBossard#GitFlowInAction

HotfixMaster

Hotfix

Release

Develop

Feature

Feature

git flow hotfix start ...

Page 19: Git flow in action

@ceciliaBossard#GitFlowInAction

SupportSupport

Master

Hotfix

Release

Develop

Feature

Feature

git flow support start ...

Page 20: Git flow in action

@ceciliaBossard#GitFlowInAction

Que devient feature2 ?Support

Master

Hotfix

Release

Develop

Feature

Feature

git rebase develop

Page 21: Git flow in action

@ceciliaBossard#GitFlowInAction

GitFlowSupport

Master

Hotfix

Release

Develop

Feature

Feature

Page 22: Git flow in action

@YourTwitterHandle@YourTwitterHandle @ceciliaBossard#GitFlowInAction

Hooks

Page 23: Git flow in action

@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

@ceciliaBossard#GitFlowInAction

Hooks

Exemples :

● Incrémentation auto des numéros de version● Appel d'une URL● ...

Page 25: Git flow in action

@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

@YourTwitterHandle@YourTwitterHandle @ceciliaBossard#GitFlowInAction

Q & A