Git flow
Upcoming SlideShare
Loading in...5
×
 

Git flow

on

  • 1,217 views

 

Statistics

Views

Total Views
1,217
Views on SlideShare
1,192
Embed Views
25

Actions

Likes
7
Downloads
71
Comments
0

3 Embeds 25

http://www.enthuse.me 14
http://www.linkedin.com 10
https://www.linkedin.com 1

Accessibility

Categories

Upload Details

Uploaded via as Apple Keynote

Usage Rights

© All Rights Reserved

Report content

Flagged as inappropriate Flag as inappropriate
Flag as inappropriate

Select your reason for flagging this presentation as inappropriate.

Cancel
  • Full Name Full Name Comment goes here.
    Are you sure you want to
    Your message goes here
    Processing…
Post Comment
Edit your comment
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n

Git flow Git flow Presentation Transcript

  • git-flowa successful branching model
  • branching model
  • decentralized but centralized
  • origin
  • origin
  • origin
  • origin
  • origin
  • origin
  • origin
  • origin
  • origin
  • origin
  • origin
  • origin
  • origin
  • origin
  • originsubteamfetches
  • originsubteamfetches
  • originsubteam subteamfetches fetches
  • originsubteam subteamfetches fetches
  • subteam fetches originsubteam subteamfetches fetches
  • subteam fetches originsubteam subteamfetches fetches
  • subteam fetches originsubteam subteamfetches fetches
  • subteam fetches originsubteam subteamfetches fetches
  • the main branches
  • production-ready statedevelop master
  • production-ready statedevelop master
  • production-ready statedevelop master
  • production-ready statedevelop master versão inicial de prod
  • production-ready statedevelop master versão inicial de prod
  • production-ready statedevelop master versão inicial de prod
  • production-ready statedevelop master versão inicial de prod
  • production-ready statedevelop master versão inicial de prod
  • production-ready statedevelop master versão inicial de prod
  • production-ready statedevelop master versão inicial de prod
  • production-ready statedevelop master versão inicial de prod
  • production-ready statedevelop master versão inicial de prod
  • production-ready statedevelop master versão inicial de prod
  • production-ready statedevelop master versão inicial de prod próximo release em prod
  • production-ready statedevelop master versão inicial de prod próximo release em prod
  • production-ready statedevelop master versão inicial de prod próximo release em prod
  • production-ready statedevelop master versão inicial de prod próximo release em prod
  • production-ready statedevelop master versão inicial de prod próximo release em prod
  • production-ready statedevelop master versão inicial de prod próximo release em prod
  • production-ready statedevelop master versão inicial de prod próximo release em prod
  • production-ready statedevelop master versão inicial de prod próximo release em prod
  • production-ready statedevelop master versão inicial de prod próximo release em prod próximo release em prod
  • production-ready statedevelop master versão inicial de prod próximo release em prod próximo release em prod
  • production-ready statedevelop master versão inicial de prod próximo release em prod próximo release em prod
  • production-ready state develop master versão inicial de prod próximo release em prodWIP para próximopróximo release em release prod
  • supporting branches
  • • Feature branches• Release branches• Hotfix branches
  • feature branches
  • •branch off from: develop•merge back into: develop•branching name convention, except: •master •develop •release-* •hotfix-*
  • feature developbranches
  • feature developbranches
  • feature developbranches
  • feature developbranches
  • feature developbranches
  • feature developbranches início desenv. nova feature
  • feature developbranches início desenv. nova feature
  • feature developbranches início desenv. nova feature
  • feature developbranches início desenv. nova feature
  • feature developbranches início desenv. nova feature
  • feature developbranches início desenv. nova feature
  • feature developbranches início desenv. nova feature
  • feature developbranches início desenv. nova feature
  • feature developbranches início desenv. nova feature
  • feature developbranches início desenv. nova feature
  • feature developbranches início desenv. nova feature
  • feature develop branches início desenv. nova feature fim desenv.nova feature
  • feature develop branches início desenv. nova feature fim desenv.nova feature
  • feature develop branches início desenv. nova feature fim desenv.nova feature
  • feature develop branches início desenv. nova feature fim desenv.nova feature
  • feature develop branches início desenv. nova feature fim desenv.nova feature feature integrada
  • branching off$ git checkout -b myfeature developSwitched to a new branch “myfeature”merging into$ git checkout developSwitched to branch “develop”$ git merge --no-ff myfeatureUpdating ea1b82a..05e9557(Summary of changes)$ git branch -d myfeatureDeleted branch “myfeature” (was 05e9557).$ git push origin develop
  • branching off$ git flow feature start myfeatureSwitched to a new branch “myfeature”merging into$ git flow feature finish myfeatureSwitched to branch “develop”Updating ea1b82a..05e9557(Summary of changes)Deleted branch “myfeature” (was 05e9557).
  • release branches
  • •branch off from: develop•merge back into: develop and master•branch name convention: •release-*
  • branching off$ git checkout -b release-1.2 developSwitched to a new branch “release-1.2”merging into$ git checkout masterSwitched to branch “master”$ git merge --no-ff release-1.2Merge made by recursive.(Summary of changes)$ git tag -a 1.2$ git checkout developSwitched to branch “develop”$ git merge --no-ff release-1.2
  • branching off$ git flow release start 1.2Switched to a new branch “release-1.2”merging into$ git flow release finish 1.2Merge made by recursive.(Summary of changes)Deleted branch “release-1.2” (was f105d3).
  • hotfix branches
  • •branch off from: master•merge back into: develop and master•branch name convention: •hotfix-*
  • develop hotfixes master
  • develop hotfixes master
  • develop hotfixes master
  • develop hotfixes master tag 1.2
  • develop hotfixes master tag 1.2
  • develop hotfixes master tag 1.2
  • develop hotfixes master tag 1.2
  • develop hotfixes master tag 1.2
  • develop hotfixes master tag 1.2
  • develop hotfixes master tag 1.2
  • develop hotfixes master tag 1.2
  • develop hotfixes master tag 1.2
  • develop hotfixes master tag 1.2
  • develop hotfixes master tag 1.2
  • develop hotfixes master tag 1.2
  • develop hotfixes master tag 1.2
  • develop hotfixes master tag 1.2 bug em prod corrigido
  • develop hotfixes master tag 1.2 bug em prod corrigido
  • develop hotfixes master tag 1.2 bug em prod corrigido
  • develop hotfixes master tag 1.2 bug em prod corrigido
  • develop hotfixes master tag 1.2 bug em prod corrigido
  • develop hotfixes master tag 1.2 bug em prod corrigido
  • develop hotfixes master tag 1.2 bug em prod corrigido
  • develop hotfixes master tag 1.2 tag 1.2.1 bug em prod corrigido
  • develop hotfixes master tag 1.2 tag 1.2.1 bug em prod corrigido
  • develop hotfixes master tag 1.2 tag 1.2.1 bug em prod corrigido
  • branching off$ git checkout -b hotfix-1.2.1 masterSwitched to a new branch “hotfix-1.2.1”merging into$ git checkout masterSwitched to branch “master”$ git merge --no-ff hotfix-1.2.1Merge made by recursive.(Summary of changes)$ git tag -a 1.2.1$ git checkout developSwitched to branch “develop”$ git merge --no-ff release-1.2.1
  • branching off$ git flow hotfix start 1.2.1Switched to a new branch “hotfix-1.2.1”merging into$ git flow hotfix finish 1.2.1Merge made by recursive.(Summary of changes)Deleted branch “hotfix-1.2.1” (was 071ab57).
  • branching model
  • github-flow a simpler git workflow
  • •git-flow é mais do que precisam•deploy contínuo para produção (>1/dia)•a ideia de releases não importa•hotfixes ~= small features
  • master “deploiável”
  • branches descritivas ex: novo-widget-rota
  • commit local a todo momento push regularmente
  • pull request
  • review merge deploy
  • git-flowa successful branching model