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

Git Branch Model

Sponsored · Ship Features Fearlessly Turn features on and off without deploys. Used by thousands of Ruby developers. →
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
1k
数据挖掘从0到1
Avatar for Ryan Lv xiaoronglv
0
220

Other Decks in Programming

See All in Programming
ローカルLLMでどこまでコードが書けるか / How much code can be written on a local LLM
Avatar for Naoki Kishida kishida
2
310
20年以上続くプロダクトでも使い続けられる静的解析ツールを求めて
Avatar for Atsushi Matsuo matsuo_atsushi
0
140
Building on Bluesky's AT Protocol with Ruby
Avatar for Kuba Suder mackuba
0
100
Kingdom of the Machine
Avatar for yui-knk yui_knk
2
1.4k
Claude Code × Gemini × Ebitengine ゲーム制作素人WebエンジニアがGoでゲームを作った話
Avatar for webzawa webzawa
0
220
t *testing.T は どこからやってくるの？
Avatar for Kotaro Otaka otakakot
1
900
🦞OpenClaw works with AWS
Avatar for matsukada licux
1
330
PicoRuby for IoT: Connecting to the Cloud with MQTT
Avatar for Y_uuu yuuu
2
760
Symfony AI in Action - SymfonyLive Berlin 2026
Avatar for Christopher Hertel chr_hertel
1
120
How We Practice Exploratory Testing in Iterative Development( #scrumniigata ) / 反復開発の中で、探索的テストをどう実施しているか
Avatar for teyamagu teyamagu
PRO
3
700
Making the RBS Parser Faster
Avatar for Soutaro Matsumoto soutaro
0
660
Agent Skills を社内で育てる仕組み作り
Avatar for jackchuka jackchuka
1
1.4k

Featured

See All Featured
Balancing Empowerment & Direction
Avatar for Lara Hogan lara
6
1.1k
How GitHub (no longer) Works
Avatar for Zach Holman holman
316
150k
Technical Leadership for Architectural Decision Making
Avatar for Kenny Baas-Schwegler baasie
3
350
Context Engineering - Making Every Token Count
Avatar for Addy Osmani addyosmani
9
860
Accessibility Awareness
Avatar for Sarah Abderemane sabderemane
1
110
So, you think you're a good person
Avatar for Per Axbom axbom
PRO
2
2k
職位にかかわらず全員がリーダーシップを発揮するチーム作り / Building a team where everyone can demonstrate leadership regardless of position
Avatar for MADOX madoxten
62
54k
Game over? The fight for quality and originality in the time of robots
Avatar for Wayne Barker wayneb77
1
170
Odyssey Design
Avatar for Ryan Kendrick rkendrick25
PRO
2
610
エンジニアに許された特別な時間の終わり
Avatar for watany watany
106
240k
The Illustrated Children's Guide to Kubernetes
Avatar for Chris Short chrisshort
51
52k
Test your architecture with Archunit
Avatar for Yoan thirion
1
2.2k

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