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
870
Anki Basic
Avatar for Ryan Lv xiaoronglv
0
1.1k
数据挖掘从0到1
Avatar for Ryan Lv xiaoronglv
0
230

Other Decks in Programming

See All in Programming
任せる範囲はこう広がった / How the Scope of AI Delegation Has Expanded
Avatar for nrs nrslib
1
210
エンジニアと一緒にテストコードの設計と実装を改善した話
Avatar for mototakatsu mototakatsu
0
230
Hunting Vulnerabilities in Symfony with LLMs
Avatar for Vincent Amstoutz vinceamstoutz
0
570
Oxlintのカスタムルールの現況
Avatar for syumai syumai
6
1.2k
気圧・高度・GPSを記録&可視化するアプリ「Koudo」を作った話
Avatar for Hajime Kato hjmkth
1
330
正しくソフトウェアを作る、前提を疑うための認知の視点 / doubt-premise
Avatar for MinoDriven minodriven
21
7.1k
TypeScript+Orvalで実現する型安全かつ堅牢でスケーラブルなマルチチャネル通知基盤 / TSKaigi Night talks ~after conference~
Avatar for doriven d0riven
0
370
決定論的オーケストレーションの設計と実装 / Design and Implementation of Deterministic Orchestration
Avatar for nrs nrslib
4
1.5k
ランチタイムLT会3周年！ランチタイムLT会を3年間続けられたお話
Avatar for y-ohgi y0hgi
1
120
過去最大のMCPアップデート! 2026-07-28 RC版の謎に迫る
Avatar for matsukada licux
6
430
トークンをケチるな、設計しろ：GitHub Copilotを賢く使うコンテキスト戦略
Avatar for Ochtum ochtum
0
250
スマートグラスで並列バイブコーディング
Avatar for Hayami Shuhei hyshu
0
270

Featured

See All Featured
The Mindset for Success: Future Career Progression
Avatar for Greg Gifford greggifford
PRO
0
370
Paper Plane
Avatar for Katie Cordina Lindsey katiecoart
PRO
1
52k
Lightning Talk: Beautiful Slides for Beginners
Avatar for Ines Montani inesmontani
PRO
2
590
Chrome DevTools: State of the Union 2024 - Debugging React & Beyond
Avatar for Addy Osmani addyosmani
10
1.2k
実際に使うSQLの書き方 徹底解説 / pgcon21j-tutorial
Avatar for soudai sone soudai
PRO
201
75k
Ten Tips & Tricks for a 🌱 transition
Avatar for Manu Carrasco Molina stuffmc
0
150
State of Search Keynote: SEO is Dead Long Live SEO
Avatar for Ryan Jones ryanjones
0
210
Building Flexible Design Systems
Avatar for Yesenia Perez-Cruz yeseniaperezcruz
330
40k
Why Our Code Smells
Avatar for Brandon Keepers bkeepers
PRO
340
58k
Statistics for Hackers
Avatar for Jake VanderPlas jakevdp
799
230k
Reality Check: Gamification 10 Years Later
Avatar for Sebastian Deterding codingconduct
0
2.2k
From Legacy to Launchpad: Building Startup-Ready Communities
Avatar for Dug Song dugsong
0
240

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