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
0
130

Git Branch Model

Avatar for Ryan Lv

Ryan Lv

August 07, 2014
Tweet

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
210

Other Decks in Programming

See All in Programming
Ruby and LLM Ecosystem 2nd
Avatar for Koichi ITO koic
1
1.3k
How to stabilize UI tests using XCTest
Avatar for Akio Itaya akkeylab
0
140
ロボットのための工場に灯りは要らない
Avatar for watany watany
12
3.2k
それはエンジニアリングの糧である：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
540
我々はなぜ「層」を分けるのか〜「関心の分離」と「抽象化」で手に入れる変更に強いシンプルな設計〜 #phperkaigi / PHPerKaigi 2026
Avatar for shogogg shogogg
2
480
Vuetify 3 → 4 何が変わった？差分と移行ポイント10分まとめ
Avatar for kouki.miura koukimiura
0
190
夢の無限スパゲッティ製造機 -実装篇- #phpstudy
Avatar for hideki kinjyo o0h
PRO
0
140
飯MCP
Avatar for Yusuke Wada yusukebe
0
360
DevinとClaude Code、SREの現場で使い倒してみた件
Avatar for karia/Y.Hisamatsu karia
1
1.1k
Symfony + NelmioApiDocBundle を使った スキーマ駆動開発 / Schema Driven Development with NelmioApiDocBundle
Avatar for Shohei Okada okashoi
0
230
安いハードウェアでVulkan
Avatar for Fadis fadis
1
800
20260320登壇資料
Avatar for 松井遼(まついはるか) pharct
0
120

Featured

See All Featured
[RailsConf 2023] Rails as a piece of cake
Avatar for Vladimir Dementyev palkan
59
6.4k
SEO in 2025: How to Prepare for the Future of Search
Avatar for Michael King ipullrank
3
3.4k
The Web Performance Landscape in 2024 [PerfNow 2024]
Avatar for Tammy Everts tammyeverts
12
1.1k
Embracing the Ebb and Flow
Avatar for Simon Collison colly
88
5k
エンジニアに許された特別な時間の終わり
Avatar for watany watany
106
240k
The untapped power of vector embeddings
Avatar for Frank van Dijk frankvandijk
2
1.6k
Darren the Foodie - Storyboard
Avatar for Kevinho.art khoart
PRO
3
3k
Raft: Consensus for Rubyists
Avatar for Patrick Van Stee vanstee
141
7.4k
RailsConf & Balkan Ruby 2019: The Past, Present, and Future of Rails at GitHub
Avatar for Eileen M. Uchitelle eileencodes
141
35k
How to build a perfect <img>
Avatar for Jono Alderson jonoalderson
1
5.3k
Fireside Chat
Avatar for paigeccino paigeccino
42
3.8k
Conquering PDFs: document understanding beyond plain text
Avatar for Ines Montani inesmontani
PRO
4
2.5k

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