Git branching strategy

Slides from an internal presentation for new staff

Derek Johnson

September 17, 2015

More Decks by Derek Johnson

See All by Derek Johnson

Responsive Web Design

0

46

1

62

Responsive images have landed

2

180

How modern web design works

0

430

Other Decks in Technology

See All in Technology

AIが盛んな時代に技術記事を書き始めて起きた私の中での小さな変化

0

350

AWS Transform CustomでIaCコードを自由自在に変換しよう

0

240

バイブコーディングで3倍早く⚪⚪を作ってみた

0

220

AgentCore×VPCでの設計パターンn選と勘所

4

380

EMから幅を広げるために最近挑戦していること / Recent challenges I'm undertaking to expand my horizons beyond EM

1

180

MySQL 9.7がやってきた～これまでのあらすじと基本情報～ @ 日本MySQLユーザ会会2026年04月 / mysql97-yattekita

0

170

20260513_生成AIを専属DSに_AI分析結果の検品テクニック_ハンズオン_交通事故データ

PRO

0

180

「誰一人取り残されない」 AIエージェント時代のプロダクト設計思想 Product Management Summit 2026

1

2.9k

変化の激しい時代をゴキゲンに生き抜くために〜ストレスマネジメントのススメ〜

PRO

4

1k

ブラウザの投機的読み込みと投機ルールAPIを理解し、Webサービスのパフォーマンスを最適化する

3

270

Agent Skillsで実現する記憶領域の運用とその後

1

310

自動テストだけで リリース判断できるチームへ - 鍵はテストの量ではなくリリース判断基準の再設計にあった / Redesigning Release Criteria for Lightweight Releases

7

3.4k

Featured

See All Featured

The #1 spot is gone: here's how to win anyway

tamaranovitovic

2

1k

A Tale of Four Properties

163

24k

The Director’s Chair: Orchestrating AI for Truly Effective Learning

1

160

<Decoding/> the Language of Devs - We Love SEO 2024

1

210

Git: the NoSQL Database

PRO

432

67k

Effective software design: The role of men in debugging patriarchy in IT @ Voxxed Days AMS

0

330

How to Align SEO within the Product Triangle To Get  Buy-In & Support - #RIMC

2

1.5k

Statistics for Hackers

799

230k

Test your architecture with Archunit

1

2.2k

Large-scale JavaScript Application Architecture

515

110k

DevOps and Value Stream Thinking: Enabling flow, efficiency and business value

1

180

The AI Revolution Will Not Be Monopolized: How open-source beats economies of scale, even for LLMs

PRO

3

3.4k

Transcript

Git branching strategy
git checkout -b offline Creates a new branch called “ofﬂine”
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 Hotﬁx 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 Hotﬁx 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 Hotﬁx 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