git workflow in medium-sized teams
TRANSCRIPT
Git Workflow in medium-sized Teams
Sergey Kosarevsky@corporateshark
Sergey Kosarevsky Git Workflow in medium-sized Teams May 13th, 2015 1 / 6
Why Git?
Git can do
very lightweight branching
easy and simple merging
We can
have many branches that are always open
merge regularly from some of them into others
use Git to create a non-blocking development workflow
Sergey Kosarevsky Git Workflow in medium-sized Teams May 13th, 2015 2 / 6
Feature Branches
Branching only works when done in a proper way. And that way is the Git way.
Create as many feature branches as you need.
Simple rule of thumb
> 1 commit to implement> 4 hours (half a day) to implement
}=⇒ create a new feature branch
Feature branches will never defile your history. Once a feature branch is merged anddeleted it is gone (...but can be restored).
Sergey Kosarevsky Git Workflow in medium-sized Teams May 13th, 2015 3 / 6
The Mainline
Long lasting open branches.The bleeding-edge branches are at the top.
master
release-8.x
rc-8.1
rc-8.1.1
Feature 1 Feature 2 Feature 3 Feature 4
Tiny Feature 1 Tiny Feature 2
Fix 1 Fix 2
Hotfix 1 Hotfix 2
• • • • • •
• • • •
• • • • •
• • •
The most stable branches are at the bottom.
Sergey Kosarevsky Git Workflow in medium-sized Teams May 13th, 2015 4 / 6
Merging and Cherry-picking
Top-down changes are never merged, only cherry-picked.Bottom-up changes are merged on a regular basis.
master
release-8.x
rc-8.1
rc-8.1.1
Feature 1 Feature 2 Feature 3 Feature 4
Tiny Feature 1 Tiny Feature 2
Fix 1 Fix 2
Hotfix 1 Hotfix 2
• • • • • •
• • • •
• • • • •
• • •
http://git-scm.com/book/en/v2/Git-Branching-Branching-Workflows“Think about them as work silos, where sets of commits graduate to a more stable silowhen they’re fully tested.”
Sergey Kosarevsky Git Workflow in medium-sized Teams May 13th, 2015 5 / 6
Questions?
Thank you for your attention!
Sergey [email protected]
Sergey Kosarevsky Git Workflow in medium-sized Teams May 13th, 2015 6 / 6