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
1k
Memcached: consistent hashing, LRU, and memory allocation
Avatar for Ryan Lv xiaoronglv
0
770
Anki Basic
Avatar for Ryan Lv xiaoronglv
0
980
数据挖掘从0到1
Avatar for Ryan Lv xiaoronglv
0
200

Other Decks in Programming

See All in Programming
LLMとPlaywright/reg-suitを活用した jQueryリファクタリングの実際
Avatar for kinocoboy kinocoboy2
2
300
実践AIチャットボットUI実装入門
Avatar for syumai syumai
3
1.6k
Swiftビルド弾丸ツアー - Swift Buildが作る新しいエコシステム
Avatar for giginet giginet
PRO
0
280
チームのテスト力を鍛える
Avatar for Hiroki Iseri goyoki
3
1.1k
Playwrightはどのようにクロスブラウザをサポートしているのか
Avatar for nus3 yotahada3
6
1.7k
Deep Dive into Kotlin Flow
Avatar for Matsuda Jumpei jmatsu
1
400
プロパティベーステストによるUIテスト: LLMによるプロパティ定義生成でエッジケースを捉える
Avatar for Tetta Noguchi tetta_pdnt
0
6.5k
The Past, Present, and Future of Enterprise Java with ASF in the Middle
Avatar for ivargrimstad ivargrimstad
0
280
複雑なフォームに立ち向かう Next.js の技術選定
Avatar for Takashi Machinaga macchiitaka
3
910
請來的 AI Agent 同事們在寫程式時，怎麼用 pytest 去除各種幻想與盲點
Avatar for Keith Yang keitheis
0
140
API Platform 4.2: Redefining API Development
Avatar for Antoine Bluchet soyuka
0
520
スケールする組織の実現に向けた インナーソース育成術 - ISGT2025
Avatar for teamLab teamlab
PRO
3
190

Featured

See All Featured
Understanding Cognitive Biases in Performance Measurement
Avatar for Philip Tellis bluesmoon
29
1.9k
How STYLIGHT went responsive
Avatar for nonsquared nonsquared
100
5.8k
Unsuck your backbone
Avatar for Amy Palamountain ammeep
671
58k
[RailsConf 2023] Rails as a piece of cake
Avatar for Vladimir Dementyev palkan
57
5.8k
Music & Morning Musume
Avatar for Bryan Veloso bryan
46
6.8k
Stop Working from a Prison Cell
Avatar for Chris Michel hatefulcrawdad
271
21k
The Power of CSS Pseudo Elements
Avatar for Geoffrey Crofte geoffreycrofte
77
6k
CSS Pre-Processors: Stylus, Less & Sass
Avatar for Bermon Painter bermonpainter
358
30k
Fight the Zombie Pattern Library - RWD Summit 2016
Avatar for Marcelo Somers marcelosomers
234
17k
A Modern Web Designer's Workflow
Avatar for Chris Coyier chriscoyier
696
190k
Code Review Best Practice
Avatar for Trisha Gee trishagee
71
19k
Facilitating Awesome Meetings
Avatar for Lara Hogan lara
55
6.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