Working with branch

บริษัท สยาม๡ํานาญกิจ จํากัด และเพื่อนพ้องน้องพี่

Cargo Cult Software engineering
https://en.wikipedia.org/wiki/Cargo_cult_programming

Google Culture

<<<<<<<<<<<
aaaaaaaaa
============
bbbbbbbbb
aaaaaaaaa
>>>>>>>>>>>

Risk management
is
project management for adults !!

Loss of productivity

Loss of confidence

Branching
is
a technique for managing risk

Branching

Merging

Branching Strategies

Merging Strategies !!

Integration/development branch
1 2 3 4

Integration/development branch
1 2 3 4
1 2 3 4
1 2 3 4
Team A
Team B
Team C

1 2 3 4
1 2 3 4
1 2 3 4
Team A
Team B
Team C

Release branch
4 5 6 7
A B
8
stable

Branching from label
4 5 6 7
A B
8
stable
X
V 1 . 0
Y
V 1 . 1

Feature/task/private branch
4 5 6 7 8
more stable
A B C
more change

Shelving
4 5 6 7
A
8

Integration pain !!
4 5 6 7 8
A B C
A B

Cherry pick
4 5 6 7
A B
8
C

No branch (feature toggle)
1 A 2 1 B 3 1 C

No branch (feature toggle)
1 A 2 1 B 3 1 C
Always ready to ship

Gatekeeper workflows
2 3 4 5
GK
A B
X Y Z
Up1
Pui
C

Forking and Pull request

Continuous Integration

Continuous Integration
is a mindset, not a tool

Tooling gives people
the opportunity to avoid taking
to each other

Manual or Automation ?

Branching can be used to
manage risk.

BUT there are more
productive ways.

Choose ?

Code change and Policy ?

What is your current
problem ?

Recommended