Git branching strategy

Slides from an internal presentation for new staff

Derek Johnson

September 17, 2015

Tweet

More Decks by Derek Johnson

See All by Derek Johnson

Responsive Web Design

0

43

1

59

Responsive images have landed

2

170

How modern web design works

0

430

Other Decks in Technology

See All in Technology

変化するコーディングエージェントとの現実的な付き合い方〜Cursor安定択説と、ツールに依存しない「資産」〜

3

640

漸進的過負荷の原則

PRO

3

420

SREじゃなかった僕らがenablingを通じて「SRE実践者」になるまでのリアル / SRE Kaigi 2026

1

110

2026年はチャンキングを極める！

8

1.7k

人はいかにして確率的な挙動を受け入れていくのか

5

3.2k

JuliaTokaiとしてはこれが最後かもしれない(仮) for NGK2026S

0

130

EventBridge API Destination × AgentCore Runtimeで実現するLambdaレスなイベント駆動エージェント

7

280

ファシリテーション勉強中その場に何が求められるかを考えるようになるまで / 20260123 Naoki Takahashi

PRO

3

410

今日から始めるAmazon Bedrock AgentCore

3

180

Lambda Durable FunctionsでStep Functionsの代わりはできるのかを試してみた

2

160

ファインディの横断SREがTakumi byGMOと取り組む、セキュリティと開発スピードの両立

0

150

月間数億レコードのアクセスログ基盤を無停止・低コストでAWS移行せよ！アプリケーションエンジニアのSREチャレンジ💪

0

220

Featured

See All Featured

Unlocking the hidden potential of vector embeddings in international SEO

0

160

The World Runs on Bad Software

PRO

72

12k

[SF Ruby Conf 2025] Rails X

0

730

Thoughts on Productivity

74

5k

Design of three-dimensional binary manipulators for pick-and-place task avoiding obstacles (IECON2024)

0

340

[Rails World 2023 - Day 1 Closing Keynote] - The Magic of Rails

38

2.7k

How to build an LLM SEO readiness audit: a practical framework

1

630

The Illustrated Children's Guide to Kubernetes

51

51k

CoffeeScript is Beautiful & I Never Want to Write Plain JavaScript Again

162

16k

Gemini Prompt Engineering: Practical Techniques for Tangible AI Outcomes

2

270

Responsive Adventures: Dirty Tricks From The Dark Corners of Front-End

254

22k

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

0

440

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