Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Features
Speaker Deck
PRO
Sign in
Sign up for free
Search
Search
Git Branch Model
Search
Ryan Lv
August 07, 2014
Programming
0
130
Git Branch Model
Ryan Lv
August 07, 2014
Tweet
Share
More Decks by Ryan Lv
See All by Ryan Lv
Understanding MySQL Explain
xiaoronglv
1
1k
Memcached: consistent hashing, LRU, and memory allocation
xiaoronglv
0
760
Anki Basic
xiaoronglv
0
980
数据挖掘从0到1
xiaoronglv
0
200
Other Decks in Programming
See All in Programming
go test -json そして testing.T.Attr / Kyoto.go #63
utgwkk
2
220
KessokuでDIでもgoroutineを活用する / Go Connect #6
mazrean
0
140
Updates on MLS on Ruby (and maybe more)
sylph01
1
170
The Past, Present, and Future of Enterprise Java
ivargrimstad
0
150
AIでLINEスタンプを作ってみた
eycjur
1
220
「手軽で便利」に潜む罠。 Popover API を WCAG 2.2の視点で安全に使うには
taitotnk
0
320
為你自己學 Python - 冷知識篇
eddie
1
330
AIレビュアーをスケールさせるには / Scaling AI Reviewers
technuma
2
240
250830 IaCの選定~AWS SAMのLambdaをECSに乗り換えたときの備忘録~
east_takumi
0
370
MCPで実現するAIエージェント駆動のNext.jsアプリデバッグ手法
nyatinte
7
1k
Namespace and Its Future
tagomoris
6
690
個人軟體時代
ethanhuang13
0
290
Featured
See All Featured
Distributed Sagas: A Protocol for Coordinating Microservices
caitiem20
333
22k
Done Done
chrislema
185
16k
Speed Design
sergeychernyshev
32
1.1k
Producing Creativity
orderedlist
PRO
347
40k
Imperfection Machines: The Place of Print at Facebook
scottboms
268
13k
Raft: Consensus for Rubyists
vanstee
140
7.1k
4 Signs Your Business is Dying
shpigford
184
22k
Building a Scalable Design System with Sketch
lauravandoore
462
33k
Product Roadmaps are Hard
iamctodd
PRO
54
11k
Save Time (by Creating Custom Rails Generators)
garrettdimon
PRO
32
1.5k
Optimizing for Happiness
mojombo
379
70k
Fantastic passwords and where to find them - at NoRuKo
philnash
52
3.4k
Transcript
Git 分⽀支策略 吕⼩小荣
Why • ⼯工作流程 • 参与到开源项⺫⽬目中
内容 • 最完美(繁琐)的 Branching Model • Github Flow • Boohee
Flow
完(繁)美(琐)
• Master • hotfix • develop • feature • release
两条主线
如何开发功能
如何修复 bug
Github Flow
术语 • fork(not fuck) • pull request
fork
pull request
区别 • 第⼀一个 Flow 是单个仓库内协作 • 第⼆二个是多个仓库之间的协作
Boohee Style “薄荷的分⽀支管理策略.”
代码库 • 共享的单仓库 • merge 时需要 pull request • 新⼈人操作要慎重
分⽀支 • master • feature/ • hotfix/ • deploy (⼤大杂烩,⼩小受,千万别被
merge)
部署到 qa • git checkout qa • git merge feature/sms
• git pull • git push • cap qa deploy
• http://nvie.com/posts/a-successful-git-branching- model/ • http://www.ruanyifeng.com/blog/2012/07/git.html Reference
thanks and return