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
ReactとSvelteのその先、Ripple-TS / Beyond React and Svelte: Ripple-TS
Avatar for TOMIKAWA Sotaro ssssota
3
1.8k
inferと仲良くなる10分間
Avatar for ryokatsuse ryokatsuse
1
290
Transactional Change Stream Processing With Debezium and Apache Flink
Avatar for Gunnar Morling gunnarmorling
1
140
Modding RubyKaigi for Myself
Avatar for yui-knk yui_knk
0
830
jQueryをバージョンアップする前に使いたいjQuery Migrate
Avatar for Atsushi Matsuo matsuo_atsushi
0
140
密結合なバックエンドから TypeScript のコードを生成する
Avatar for kemuridama kemuridama
1
390
メソッドのジェネリクスでGoの夢は広がるか？ / Kyoto.go #65
Avatar for utagawa kiki utgwkk
0
230
関係性から理解する"同一性"の型用語たち
Avatar for pvcresin pvcresin
2
620
権限チェックの一貫性を型で守る TypeScript による多層防御
Avatar for aster-mnch (kitagawa) mnch
4
990
代数的データ型って何が嬉しいの？ #frontend_phpcon_do
Avatar for Takuma Kajikawa kajitack
7
2.4k
AI駆動開発勉強会 広島支部 第一回勉強会 AI駆動開発概要とワークショップ
Avatar for smz hyt hayatoshimiu
0
420
ビジネスモデルから紐解く、AI+型駆動開発
Avatar for Hiroki Omote hirokiomote
2
4.7k

Featured

See All Featured
From π to Pie charts
Avatar for Rasagy Sharma rasagy
0
190
The Director’s Chair: Orchestrating AI for Truly Effective Learning
Avatar for Mike Taylor tmiket
1
180
Embracing the Ebb and Flow
Avatar for Simon Collison colly
88
5.1k
Git: the NoSQL Database
Avatar for Brandon Keepers bkeepers
PRO
432
67k
ピンチをチャンスに：未来をつくるプロダクトロードマップ #pmconf2020
Avatar for Aki / @LoveIdahoBurger aki_iinuma
128
55k
brightonSEO & MeasureFest 2025 - Christian Goodrich - Winning strategies for Black Friday CRO & PPC
Avatar for Christian Goodrich cargoodrich
3
710
Designing Dashboards & Data Visualisations in Web Apps
Avatar for Des Traynor destraynor
231
55k
Tips & Tricks on How to Get Your First Job In Tech
Avatar for Honza Javorek honzajavorek
1
520
Refactoring Trust on Your Teams (GOTO; Chicago 2020)
Avatar for Rebecca Miller-Webster rmw
35
3.5k
Understanding Cognitive Biases in Performance Measurement
Avatar for Philip Tellis bluesmoon
32
2.9k
10 Git Anti Patterns You Should be Aware of
Avatar for Lemi Orhan Ergin lemiorhan
PRO
659
62k
The Hidden Cost of Media on the Web [PixelPalooza 2025]
Avatar for Tammy Everts tammyeverts
2
320

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