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

48

1

72

Responsive images have landed

2

190

How modern web design works

0

440

Other Decks in Technology

See All in Technology

AI時代の開発はウォーターフォールに回帰する？ / development-with-ai-back-to-wf

okamototakuyasr2

0

110

野良MCPサーバーを排除せよ！MCPサーバーのガバナンス

1

240

LLM-as-a-Judgeは本当に信頼できるのか――評価器を評価する話

3

1.1k

Adversary Infrastructure Hunting101

0

160

[FECONF-2026] 신대륙을 향한 카카오페이증권 프론트엔드 항해기 (이주승)

0

200

Claude Code をローカルとサーバー上で利用した際の Bedrock 利用料をユーザー単位で一本化してみる

0

160

AI時代のGraphQL

3

410

What Is JetBrains Air

PRO

0

170

撮るだけでは終わらない。ソニーが挑むB2Bカメラソリューション開発

0

110

freeeにおける AI を用いたブラウザ動作確認の自動化の取り組み

PRO

0

220

[re:Invent2026事前勉強会(有志開催)]続きは、ラスベガスの廊下で / continue-in-the-vegas-hallway

0

250

Draft AIエージェントのトークン消費を最小化する 8つの原則

5

1.7k

Featured

See All Featured

Game over? The fight for quality and originality in the time of robots

1

310

Jess Joyce - The Pitfalls of Following Frameworks

PRO

1

450

WENDY [Excerpt]

14

40k

Product Roadmaps are Hard

55

13k

Statistics for Hackers

799

230k

Highjacked: Video Game Concept Design

PRO

1

490

Claude Code どこまでも/ Claude Code Everywhere

68

59k

A brief & incomplete history of  UX Design for the World Wide Web: 1989–2019

2

540

187

17k

How to Grow Your eCommerce with AI & Automation

PRO

2

330

How to Talk to Developers About Accessibility

2

590

A Modern Web Designer's Workflow

699

190k

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