Git branching strategy

September 17, 2015

100

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

430

Other Decks in Technology

See All in Technology

GoCon2026 - Open Source, Open World

2

1.4k

ペアプロの価値はコードを書くことだけじゃない

PRO

0

160

例外の正しい扱い方そのエラー try-catchして大丈夫？

3

430

WAF 運用改善の承認サイクル/SRE_BizReach_MIXI_1

visional_engineering_and_design

2

410

Snowflakeで実現する全社横断の顧客の声（VOC）分析・活用基盤@Snowflake World Tour Tokyo 2026

0

150

コスト最適化の「めんどくさい」を AWS FinOps Agent でチョット楽にする

classmethod_kaz

0

290

クロスボーダーM&AのValue Upを支えるプロダクト開発。日米チームのハブになったプロダクトエンジニアの実践 / Product Engineering Conference 2026

0

110

20260906 「AWS運用入門」著者が教える、運用業務への生成AI活用入門

0

260

#jawssonic2026 あの時代が悪かった ~動かなかったSageMakerと共に迎えたイベント当日~

0

140

AIとペアプロを始める。人とのペアプロをやめる。ペアプロの良さを改めて知る。もっと好きになった。 / Rediscovering Pair Programming

1

330

DEFCON34-Write-up_HYCu-MYCu

0

130

AI-DLCって実際どう？〜聞きたいこと全部聞いてみる〜

0

250

Featured

See All Featured

A better future with KSS

240

18k

Being A Developer After 40

91

590k

Why Our Code Smells

PRO

340

58k

Unlocking the hidden potential of vector embeddings in international SEO

0

930

Highjacked: Video Game Concept Design

PRO

1

450

For a Future-Friendly Web

183

10k

How To Speak Unicorn (iThemes Webinar)

1

570

Bridging the Design Gap: How Collaborative Modelling removes blockers to flow between stakeholders and teams @FastFlow conf

0

690

Jess Joyce - The Pitfalls of Following Frameworks

PRO

1

410

How to build a perfect <img>

1

6k

A Soul's Torment

7

3.6k

Why Your Marketing Sucks and What You Can Do About It - Sophie Logan

0

400

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