Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Speaker Deck
PRO
Sign in
Sign up for free
Git Branch Model
Ryan Lv
August 07, 2014
Programming
0
87
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
580
Memcached: consistent hashing, LRU, and memory allocation
xiaoronglv
0
450
Anki Basic
xiaoronglv
0
480
数据挖掘从0到1
xiaoronglv
0
100
Other Decks in Programming
See All in Programming
読みやすいコードを書こう
yutorin
0
390
About Type Syntax Proposal
quramy
1
1k
Unity Localization で多言語対応実装しよう / xrdnk-yokohamaunity-lt10-20220513
xrdnk
0
100
Get Ready for Jakarta EE 10
ivargrimstad
0
2.2k
競プロへの誘 -いざな-
u76ner
0
350
Language Summit 2022: WebAssembly: Python in the browser and beyond
tiran
2
310
heyにおけるSREの大切さ~マルチプロダクト運用の「楽しさ」と「難しさ」および今後の展望~
fufuhu
3
1.6k
Reactでアプリケーションを構築する多様化
sakito
4
3.2k
Modern Web Apps with Spring Boot, Angular & TypeScript
toedter
12
14k
書籍『良いコード/悪いコードで学ぶ設計入門』でエンジニアリングの当たり前を変える
minodriven
3
1.1k
脱オブジェクト指向講座(5分LT資料)
kishida
8
11k
Managing gRPC with Wire
oldergod
2
150
Featured
See All Featured
Agile that works and the tools we love
rasmusluckow
319
19k
RailsConf & Balkan Ruby 2019: The Past, Present, and Future of Rails at GitHub
eileencodes
119
28k
Responsive Adventures: Dirty Tricks From The Dark Corners of Front-End
smashingmag
237
19k
Product Roadmaps are Hard
iamctodd
34
6.1k
Faster Mobile Websites
deanohume
294
28k
What's new in Ruby 2.0
geeforr
336
30k
Clear Off the Table
cherdarchuk
79
280k
Fashionably flexible responsive web design (full day workshop)
malarkey
396
62k
Building Flexible Design Systems
yeseniaperezcruz
310
33k
実際に使うSQLの書き方 徹底解説 / pgcon21j-tutorial
soudai
38
12k
Creating an realtime collaboration tool: Agile Flush - .NET Oxford
marcduiker
3
430
Facilitating Awesome Meetings
lara
29
3.9k
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