Upgrade to Pro — share decks privately, control downloads, hide ads and more …

Git Branch Model

Avatar for Ryan Lv Ryan Lv
August 07, 2014
Programming
140
0

Git Branch Model

Avatar for Ryan Lv

Ryan Lv

August 07, 2014

More Decks by Ryan Lv

See All by Ryan Lv
Understanding MySQL Explain
Avatar for Ryan Lv xiaoronglv
1
1.1k
Memcached: consistent hashing, LRU, and memory allocation
Avatar for Ryan Lv xiaoronglv
0
860
Anki Basic
Avatar for Ryan Lv xiaoronglv
0
1k
数据挖掘从0到1
Avatar for Ryan Lv xiaoronglv
0
220

Other Decks in Programming

See All in Programming
PCOVから学ぶコードカバレッジ #phpcon_odawara
Avatar for hideki kinjyo o0h
PRO
0
250
Don't Prompt Harder, Structure Better
Avatar for Yusuke Kita kitasuke
0
670
Linux Kernelの1文字のミスで 権限昇格ができた話
Avatar for rona rqda
0
2.3k
AIエージェントで業務改善してみた
Avatar for takumi taku271
0
500
TiDBのアーキテクチャから学ぶ分散システム入門 〜MySQL互換のNewSQLは何を解決するのか〜 / tidb-architecture-study
Avatar for DPon dznbk
1
150
それはエンジニアリングの糧である：AI開発のためにAIのOSSを開発する現場より / It serves as fuel for engineering: insights from the field of developing open-source AI for AI development.
Avatar for nrs nrslib
1
840
一度始めたらやめられない開発効率向上術 / Findy あなたのdotfilesを教えて！
Avatar for Takashi Kokubun k0kubun
4
2.9k
ふりがな Deep Dive try! Swift Tokyo 2026
Avatar for watura watura
0
180
LM Linkで(非力な！)ノートPCでローカルLLM
Avatar for 瀬尾佳隆 seosoft
0
460
PHP 7.4でもOpenTelemetryゼロコード計装がしたい！ / PHPerKaigi 2026
Avatar for Arthur arthur1
1
550
「接続」—パフォーマンスチューニングの最後の一手 〜点と点を結ぶ、その一瞬のために〜
Avatar for 武田 憲太郎 kentaroutakeda
5
2.5k
forteeの改修から振り返るPHPerKaigi 2026
Avatar for muno92 muno92
PRO
3
260

Featured

See All Featured
Imperfection Machines: The Place of Print at Facebook
Avatar for Scott Boms scottboms
270
14k
A better future with KSS
Avatar for Kyle Neath kneath
240
18k
Making the Leap to Tech Lead
Avatar for Ryan Cromwell cromwellryan
135
9.8k
Tell your own story through comics
Avatar for letsgokoyo letsgokoyo
1
890
Redefining SEO in the New Era of Traffic Generation
Avatar for Szymon Słowik szymonslowik
1
270
Exploring the Power of Turbo Streams & Action Cable | RailsConf2023
Avatar for Kevin Liebholz kevinliebholz
37
6.3k
Claude Code のすすめ
Avatar for schroneko schroneko
67
220k
Impact Scores and Hybrid Strategies: The future of link building
Avatar for Tamara Novitovic tamaranovitovic
0
250
Paper Plane
Avatar for Katie Cordina Lindsey katiecoart
PRO
1
49k
Testing 201, or: Great Expectations
Avatar for Joseph Mastey jmmastey
46
8.1k
Dominate Local Search Results - an insider guide to GBP, reviews, and Local SEO
Avatar for Greg Gifford greggifford
PRO
0
140
Groundhog Day: Seeking Process in Gaming for Health
Avatar for Sebastian Deterding codingconduct
0
140

Transcript

  1. Git 分⽀支策略 吕⼩小荣

  2. Why • ⼯工作流程 • 参与到开源项⺫⽬目中

  3. 内容 • 最完美（繁琐）的 Branching Model • Github Flow • Boohee

    Flow

  4. 完（繁）美（琐）

  5. • Master • hotfix • develop • feature • release

  6. 两条主线

  7. 如何开发功能

  8. 如何修复 bug

  9. Github Flow

  10. 术语 • fork（not fuck） • pull request

  11. fork

  12. pull request

  13. 区别 • 第⼀一个 Flow 是单个仓库内协作 • 第⼆二个是多个仓库之间的协作

  14. Boohee Style “薄荷的分⽀支管理策略.”

  15. 代码库 • 共享的单仓库 • merge 时需要 pull request • 新⼈人操作要慎重

  16. 分⽀支 • master • feature/ • hotfix/ • deploy （⼤大杂烩，⼩小受，千万别被

    merge）

  17. 部署到 qa • git checkout qa • git merge feature/sms

    • git pull • git push • cap qa deploy

  18. • http://nvie.com/posts/a-successful-git-branching- model/ • http://www.ruanyifeng.com/blog/2012/07/git.html Reference

  19. thanks and return