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
760
Anki Basic
xiaoronglv
0
980
数据挖掘从0到1
xiaoronglv
0
200
Other Decks in Programming
See All in Programming
プロパティベーステストによるUIテスト: LLMによるプロパティ定義生成でエッジケースを捉える
tetta_pdnt
0
4.3k
How Android Uses Data Structures Behind The Scenes
l2hyunwoo
0
480
複雑なフォームに立ち向かう Next.js の技術選定
macchiitaka
2
250
意外と簡単!?フロントエンドでパスキー認証を実現する WebAuthn
teamlab
PRO
2
780
OSS開発者という働き方
andpad
5
1.7k
1から理解するWeb Push
dora1998
7
2k
基礎から学ぶ大画面対応(Learning Large-Screen Support from the Ground Up)
tomoya0x00
0
4.3k
GitHubとGitLabとAWS CodePipelineでCI/CDを組み比べてみた
satoshi256kbyte
4
250
rage against annotate_predecessor
junk0612
0
170
個人開発で徳島大学生60%以上の心を掴んだアプリ、そして手放した話
akidon0000
1
150
go test -json そして testing.T.Attr / Kyoto.go #63
utgwkk
3
320
Tool Catalog Agent for Bedrock AgentCore Gateway
licux
7
2.6k
Featured
See All Featured
Docker and Python
trallard
46
3.6k
Why Our Code Smells
bkeepers
PRO
339
57k
Site-Speed That Sticks
csswizardry
10
830
The Power of CSS Pseudo Elements
geoffreycrofte
77
6k
Balancing Empowerment & Direction
lara
3
630
Why You Should Never Use an ORM
jnunemaker
PRO
59
9.5k
Agile that works and the tools we love
rasmusluckow
330
21k
How STYLIGHT went responsive
nonsquared
100
5.8k
Side Projects
sachag
455
43k
What's in a price? How to price your products and services
michaelherold
246
12k
Rails Girls Zürich Keynote
gr2m
95
14k
Dealing with People You Can't Stand - Big Design 2015
cassininazir
367
27k
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