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 branching strategy
Search
Derek Johnson
September 17, 2015
Technology
0
91
Git branching strategy
Slides from an internal presentation for new staff
Derek Johnson
September 17, 2015
Tweet
Share
More Decks by Derek Johnson
See All by Derek Johnson
Responsive Web Design
derekjohnson
0
41
Git basics
derekjohnson
1
58
Responsive images have landed
derekjohnson
2
160
How modern web design works
derekjohnson
0
420
Other Decks in Technology
See All in Technology
自動テストのコストと向き合ってみた
qa
1
230
小学4年生夏休みの自由研究「ぼくと Copilot エージェント」
taichinakamura
0
700
AWS Top Engineer、浮いてませんか? / As an AWS Top Engineer, Are You Out of Place?
yuj1osm
2
210
LLMアプリの地上戦開発計画と運用実践 / 2025.10.15 GPU UNITE 2025
smiyawaki0820
1
520
OCI Network Firewall 概要
oracle4engineer
PRO
2
7.9k
オープンソースでどこまでできる?フォーマル検証チャレンジ
msyksphinz
0
130
コンテキストエンジニアリング入門〜AI Coding Agent作りで学ぶ文脈設計〜
kworkdev
PRO
1
760
Introduction to Sansan Meishi Maker Development Engineer
sansan33
PRO
0
310
セキュアな認可付きリモートMCPサーバーをAWSマネージドサービスでつくろう! / Let's build an OAuth protected remote MCP server based on AWS managed services
kaminashi
3
320
『OCI で学ぶクラウドネイティブ 実践 × 理論ガイド』 書籍概要
oracle4engineer
PRO
3
220
生成AIとM5Stack / M5 Japan Tour 2025 Autumn 東京
you
PRO
0
250
PHPからはじめるコンピュータアーキテクチャ / From Scripts to Silicon: A Journey Through the Layers of Computing Hiroshima 2025 Edition
tomzoh
0
140
Featured
See All Featured
What's in a price? How to price your products and services
michaelherold
246
12k
Reflections from 52 weeks, 52 projects
jeffersonlam
352
21k
Making Projects Easy
brettharned
119
6.4k
Sharpening the Axe: The Primacy of Toolmaking
bcantrill
45
2.5k
A designer walks into a library…
pauljervisheath
209
24k
4 Signs Your Business is Dying
shpigford
185
22k
The Web Performance Landscape in 2024 [PerfNow 2024]
tammyeverts
9
870
How To Stay Up To Date on Web Technology
chriscoyier
791
250k
How to train your dragon (web standard)
notwaldorf
96
6.3k
How STYLIGHT went responsive
nonsquared
100
5.8k
Let's Do A Bunch of Simple Stuff to Make Websites Faster
chriscoyier
507
140k
The Power of CSS Pseudo Elements
geoffreycrofte
79
6k
Transcript
Git branching strategy
git checkout -b offline Creates a new branch called “offline”
branching off from the current branch
git checkout dev Moves to an existing branch called “dev”
git branch -m watch clock Renames a branch called “watch”
to “clock”
git branch -m develop Renames the current branch to “develop”
git branch -d develop Deletes the branch called “develop”
git merge --no-ff aria Merges the branch called “aria” into
the current branch
git checkout -t origin/staging Create a new branch called “staging”
that tracks the remote branch called “staging”
None
Feature branches Release branches Hotfix branches
None
git checkout -b <feature>
None
git checkout dev git merge --no-ff <feature>
None
git checkout staging git merge --no-ff dev
Feature branches Release branches Hotfix branches
None
git checkout -b release-2.2.0
README.md CHANGELOG.md
None
None
git checkout master git merge --no-ff release-2.2.0 git tag 2.2.0
git push origin master 2.2.0
Feature branches Release branches Hotfix branches
None
git checkout -b hotfix-2.2.1
README.md CHANGELOG.md
None
git checkout -t origin/staging Create a new branch called “staging”
that tracks the remote branch called “staging”
git push -u origin staging Push a local branch called
“staging” to remote