Upgrade to Pro — share decks privately, control downloads, hide ads and more …

Git Feature Branches as an Art

Matthew McCullough
March 12, 2014
Programming
0
160

Git Feature Branches as an Art

Slides from Matthew's Fluent (http://fluentconf.com/fluent2014) talk on Feature Branches in Git.

Matthew McCullough

March 12, 2014
Tweet

More Decks by Matthew McCullough

See All by Matthew McCullough
Patterns for Collaborative Software Development in a Social World at JavaOne 2015
matthewmccullough
1
380
Collaborative Software Development in a Social World at the Utah JUG
matthewmccullough
2
160
Git and GitHub Platform Review
matthewmccullough
1
470
Your First Pull Request
matthewmccullough
0
280
Git and GitHub Workflows at the Utah JUG
matthewmccullough
1
810
Agile-ish life at GitHub
matthewmccullough
2
370
Git and GitHub Agile Workflows for HP
matthewmccullough
0
290
Writing Tools on the GitHub Platform
matthewmccullough
0
260
The Foundations of Collaboration with GitHub • SIGCSE 2014
matthewmccullough
1
110

Other Decks in Programming

See All in Programming
Bedrock×MCPで社内ブログ執筆文化を育てたい！
har1101
6
1k
Kamal 2 – Get Out of the Cloud
aleksandrov
1
190
エンジニアが挑む、限界までの越境
nealle
1
240
Qiita Bash
mercury_dev0517
2
200
一緒に働きたくなるプログラマの思想 #QiitaConference
mu_zaru
50
13k
大LLM時代にこの先生きのこるには-ITエンジニア編
fumiyakume
7
3.1k
AWS で実現する 安全な AI エージェントの作り方 〜 Bedrock Engineer の実装例を添えて 〜 / how-to-build-secure-ai-agents
gawa
8
830
Amazon CloudWatchの地味だけど強力な機能紹介！
itotsum
0
180
生成AIを使ったQAアプリケーションの作成 - ハンズオン補足資料
oracle4engineer
PRO
3
240
リアルタイムレイトレーシング + ニューラルレンダリング簡単紹介 / Real-Time Ray Tracing & Neural Rendering: A Quick Introduction (2025)
shocker_0x15
1
310
音声プラットフォームのアーキテクチャ変遷から学ぶ、クラウドネイティブなバッチ処理 (20250422_CNDS2025_Batch_Architecture)
thousanda
0
220
趣味全開のAITuber開発
kokushin
0
200

Featured

See All Featured
Adopting Sorbet at Scale
ufuk
76
9.3k
RailsConf & Balkan Ruby 2019: The Past, Present, and Future of Rails at GitHub
eileencodes
135
33k
Unsuck your backbone
ammeep
670
57k
Done Done
chrislema
183
16k
Automating Front-end Workflow
addyosmani
1369
200k
Making the Leap to Tech Lead
cromwellryan
133
9.2k
Fireside Chat
paigeccino
37
3.4k
Become a Pro
speakerdeck
PRO
27
5.3k
Testing 201, or: Great Expectations
jmmastey
42
7.5k
A Tale of Four Properties
chriscoyier
158
23k
Dealing with People You Can't Stand - Big Design 2015
cassininazir
367
26k
The Myth of the Modular Monolith - Day 2 Keynote - Rails World 2024
eileencodes
23
2.6k

Transcript

  1. Feature Branches
 as an art with Matthew McCullough at Fluent

    2014

  2. [email protected] education.github.com @matthewmccull Q&A

  3. Branch everything

  4. Reuse commit messages

  5. Combine with amend

  6. Redo with reset

  7. Squash a merge

  8. Reuse with cherry pick

  9. Rebase on a branch

  10. Rebase interactively

  11. Fixup with rebase

  12. Branch duplication

  13. Reflog for resurrection