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

Other Decks in Programming

See All in Programming
SLOをサービス品質の共通言語にするために 取り組んできたこと
Avatar for wakanaction wakana0222
0
550
作るコストが小さくなった時代 幸せに働くために改めて考えたいこと 〜エンジニアとして価値を出し続けるために注視している二分野〜
Avatar for YuppeEng yuppeeng
0
120
使用 Meilisearch 建立新聞搜尋工具
Avatar for johnroyer johnroyer
0
170
はてなアカウント基盤 State of the Union
Avatar for cockscomb cockscomb
1
1.3k
광주소프트웨어마이스터고등학교 DevFest 특강 - 바이브 코딩 시대에서 주니어 개발자로 살아남는 방법
Avatar for Chris Ohk utilforever
1
150
Built Our Own Background Agent at LayerX #aidevex_findy
Avatar for LayerX layerx
PRO
8
3.4k
任せる範囲はこう広がった / How the Scope of AI Delegation Has Expanded
Avatar for nrs nrslib
1
280
AWS CDK を「作」ってみた 〜フルスクラッチで見えた CDK の裏側〜 / aws-cdk-from-scratch
Avatar for k.goto gotok365
3
2.4k
AIが無かった頃の素敵な出会いの話
Avatar for コドモン開発チーム codmoninc
1
220
AI時代、エンジニアはどう育つのか -未経験エンジニアの成長を間近で見て考えたこと-
Avatar for ta-hasunuma thasu0123
0
150
FDEが実現するAI駆動経営の現在地
Avatar for ryuta sakamoto gonta
2
220
Foundation Models frameworkで画像分析
Avatar for リョウ ryodeveloper
1
140

Featured

See All Featured
RailsConf 2023
Avatar for Aaron Patterson tenderlove
30
1.5k
What’s in a name? Adding method to the madness
Avatar for The Alliance productmarketing
PRO
24
4.1k
Mobile First: as difficult as doing things right
Avatar for Swwweet swwweet
225
10k
Building a A Zero-Code AI SEO Workflow
Avatar for Ian Lurie portentint
PRO
0
640
Odyssey Design
Avatar for Ryan Kendrick rkendrick25
PRO
2
730
Taking LLMs out of the black box: A practical guide to human-in-the-loop distillation
Avatar for Ines Montani inesmontani
PRO
3
2.3k
ピンチをチャンスに：未来をつくるプロダクトロードマップ #pmconf2020
Avatar for Aki / @LoveIdahoBurger aki_iinuma
128
56k
Why Mistakes Are the Best Teachers: Turning Failure into a Pathway for Growth
Avatar for Umar Saidu Auna auna
0
190
Avoiding the “Bad Training, Faster” Trap in the Age of AI
Avatar for Mike Taylor tmiket
0
200
The AI Search Optimization Roadmap by Aleyda Solis
Avatar for Aleyda Solis aleyda
1
6k
技術選定の審美眼（2025年版） / Understanding the Spiral of Technologies 2025 edition
Avatar for Takuto Wada twada
PRO
118
120k
Context Engineering - Making Every Token Count
Avatar for Addy Osmani addyosmani
9
1k

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