Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Features
Speaker Deck
PRO
Sign in
Sign up for free
Search
Search
Git Branch Model
Search
Ryan Lv
August 07, 2014
Programming
0
110
Git Branch Model
Ryan Lv
August 07, 2014
Tweet
Share
More Decks by Ryan Lv
See All by Ryan Lv
Understanding MySQL Explain
xiaoronglv
1
790
Memcached: consistent hashing, LRU, and memory allocation
xiaoronglv
0
550
Anki Basic
xiaoronglv
0
700
数据挖掘从0到1
xiaoronglv
0
130
Other Decks in Programming
See All in Programming
Build Apps for iOS, Android & Desktop in 100% Kotlin With Compose Multiplatform (mDevCamp 2024)
zsmb
0
340
Apache Hive 4 on Treasure Data
ryukobayashi
0
330
Goのエラースタックトレースの歴史と今後
sonatard
9
1.5k
新宿ダンジョンを可視化してみた
satoshi7190
2
260
大規模Reactアプリのリアーキテクチャ~8万行のTanStack Query移行の軌跡~
kj455
4
960
Site Reliability Engineering for GMO
pyama86
8
1k
CA.swift19 恋するAIアプリ開発の裏側
oskmr
0
360
GraphQLサーバの構成要素を整理する #ハッカー鮨 #tsukijigraphql / graphql server technology selection
izumin5210
4
840
GitHub Actionsで泣かないためにやっておきたい設定 / Recommended GHA settings to avoid crying
pinkumohikan
3
540
障害対応を起点としたもっといい開発と運用のサイクル作りのためにできること / Hatena Enginner Seminar #29
polamjag
0
180
OpenAPIを中心に考えるAPI開発入門 / Introduction to API Development with a Focus on OpenAPI
seike460
PRO
2
170
Elm 0.19.0 Changes
bkuhlmann
0
490
Featured
See All Featured
Intergalactic Javascript Robots from Outer Space
tanoku
266
26k
"I'm Feeling Lucky" - Building Great Search Experiences for Today's Users (#IAC19)
danielanewman
221
21k
Dealing with People You Can't Stand - Big Design 2015
cassininazir
357
22k
Clear Off the Table
cherdarchuk
84
310k
Statistics for Hackers
jakevdp
789
220k
Designing the Hi-DPI Web
ddemaree
276
33k
Large-scale JavaScript Application Architecture
addyosmani
504
110k
4 Signs Your Business is Dying
shpigford
175
21k
Fashionably flexible responsive web design (full day workshop)
malarkey
398
65k
[RailsConf 2023 Opening Keynote] The Magic of Rails
eileencodes
9
8.3k
Unsuck your backbone
ammeep
663
57k
Understanding Cognitive Biases in Performance Measurement
bluesmoon
7
1k
Transcript
Git 分⽀支策略 吕⼩小荣
Why • ⼯工作流程 • 参与到开源项⺫⽬目中
内容 • 最完美(繁琐)的 Branching Model • Github Flow • Boohee
Flow
完(繁)美(琐)
• Master • hotfix • develop • feature • release
两条主线
如何开发功能
如何修复 bug
Github Flow
术语 • fork(not fuck) • pull request
fork
pull request
区别 • 第⼀一个 Flow 是单个仓库内协作 • 第⼆二个是多个仓库之间的协作
Boohee Style “薄荷的分⽀支管理策略.”
代码库 • 共享的单仓库 • merge 时需要 pull request • 新⼈人操作要慎重
分⽀支 • master • feature/ • hotfix/ • deploy (⼤大杂烩,⼩小受,千万别被
merge)
部署到 qa • git checkout qa • git merge feature/sms
• git pull • git push • cap qa deploy
• http://nvie.com/posts/a-successful-git-branching- model/ • http://www.ruanyifeng.com/blog/2012/07/git.html Reference
thanks and return