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
130
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
1k
Memcached: consistent hashing, LRU, and memory allocation
xiaoronglv
0
780
Anki Basic
xiaoronglv
0
980
数据挖掘从0到1
xiaoronglv
0
200
Other Decks in Programming
See All in Programming
10年もののAPIサーバーにおけるCI/CDの改善の奮闘
mbook
0
800
複雑化したリポジトリをなんとかした話 pipenvからuvによるモノレポ構成への移行
satoshi256kbyte
1
1k
Railsだからできる 例外業務に禍根を残さない 設定設計パターン
ei_ei_eiichi
0
440
エンジニアとして高みを目指す、 利益を生み出す設計の考え方 / design-for-profit
minodriven
24
12k
Le côté obscur des IA génératives
pascallemerrer
0
140
技術的負債の正体を知って向き合う / Facing Technical Debt
irof
0
140
Swift Concurrency - 状態監視の罠
objectiveaudio
2
490
Pull-Requestの内容を1クリックで動作確認可能にするワークフロー
natmark
2
490
overlayPreferenceValue で実現する ピュア SwiftUI な AdMob ネイティブ広告
uhucream
0
180
Catch Up: Go Style Guide Update
andpad
0
210
XP, Testing and ninja testing ZOZ5
m_seki
3
580
CI_CD「健康診断」のススメ。現場でのボトルネック特定から、健康診断を通じた組織的な改善手法
teamlab
PRO
0
200
Featured
See All Featured
No one is an island. Learnings from fostering a developers community.
thoeni
21
3.5k
Templates, Plugins, & Blocks: Oh My! Creating the theme that thinks of everything
marktimemedia
31
2.5k
Navigating Team Friction
lara
189
15k
Practical Tips for Bootstrapping Information Extraction Pipelines
honnibal
PRO
23
1.5k
Designing Experiences People Love
moore
142
24k
Java REST API Framework Comparison - PWX 2021
mraible
33
8.9k
[Rails World 2023 - Day 1 Closing Keynote] - The Magic of Rails
eileencodes
37
2.6k
I Don’t Have Time: Getting Over the Fear to Launch Your Podcast
jcasabona
33
2.5k
Done Done
chrislema
185
16k
Creating an realtime collaboration tool: Agile Flush - .NET Oxford
marcduiker
32
2.3k
The Pragmatic Product Professional
lauravandoore
36
6.9k
実際に使うSQLの書き方 徹底解説 / pgcon21j-tutorial
soudai
PRO
189
55k
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