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

Git Feature Branches as an Art

Sponsored · Ship Features Fearlessly Turn features on and off without deploys. Used by thousands of Ruby developers. →
Avatar for Matthew McCullough Matthew McCullough
March 12, 2014
Programming
0
190

Git Feature Branches as an Art

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

Avatar for Matthew McCullough

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
Avatar for Matthew McCullough matthewmccullough
1
410
Collaborative Software Development in a Social World at the Utah JUG
Avatar for Matthew McCullough matthewmccullough
2
180
Git and GitHub Platform Review
Avatar for Matthew McCullough matthewmccullough
1
550
Your First Pull Request
Avatar for Matthew McCullough matthewmccullough
0
330
Git and GitHub Workflows at the Utah JUG
Avatar for Matthew McCullough matthewmccullough
1
850
Agile-ish life at GitHub
Avatar for Matthew McCullough matthewmccullough
2
410
Git and GitHub Agile Workflows for HP
Avatar for Matthew McCullough matthewmccullough
0
330
Writing Tools on the GitHub Platform
Avatar for Matthew McCullough matthewmccullough
0
290
The Foundations of Collaboration with GitHub • SIGCSE 2014
Avatar for Matthew McCullough matthewmccullough
1
130

Other Decks in Programming

See All in Programming
LLM Observabilityによる 対話型音声AIアプリケーションの安定運用
Avatar for Hiroyuki Moriya gekko0114
2
400
HTTPプロトコル正しく理解していますか？ 〜かわいい猫と共に学ぼう。ฅ^•ω•^ฅ ﾆｬ〜
Avatar for ♛Heitor Hirose hekuchan
2
660
OSSとなったswift-buildで Xcodeのビルドを差し替えられるため 自分でXcodeを直せる時代になっている ダイアモンド問題編
Avatar for yimajo yimajo
3
470
Data-Centric Kaggle
Avatar for ねぼすけAI isax1015
2
700
組織で育むオブザーバビリティ
Avatar for ryotaro kobayashi ryota_hnk
0
150
それ、本当に安全？ ファイルアップロードで見落としがちなセキュリティリスクと対策
Avatar for ikechi penpeen
7
2.4k
AIで開発はどれくらい加速したのか？AIエージェントによるコード生成を、現場の評価と研究開発の評価の両面からdeep diveしてみる
Avatar for どすこい daisuketakeda
1
900
なるべく楽してバックエンドに型をつけたい！(楽とは言ってない)
Avatar for HIBIKI CUBE hibiki_cube
0
130
rack-attack gemによるリクエスト制限の失敗と学び
Avatar for なっちゃん pndcat
0
250
AIによるイベントストーミング図からのコード生成 / AI-powered code generation from Event Storming diagrams
Avatar for nrs nrslib
2
1.6k
Automatic Grammar Agreementと Markdown Extended Attributes
について
Avatar for Kishikawa Katsumi kishikawakatsumi
0
140
CSC307 Lecture 01
Avatar for Javier Gonzalez-Sanchez javiergs
PRO
0
680

Featured

See All Featured
Producing Creativity
Avatar for Steve Smith orderedlist
PRO
348
40k
StorybookのUI Testing Handbookを読んだ
Avatar for Shingo Yamazaki zakiyama
31
6.5k
Impact Scores and Hybrid Strategies: The future of link building
Avatar for Tamara Novitovic tamaranovitovic
0
190
Gemini Prompt Engineering: Practical Techniques for Tangible AI Outcomes
Avatar for Mfonobong Umondia mfonobong
2
260
Data-driven link building: lessons from a $708K investment (BrightonSEO talk)
Avatar for Szymon szymonslowik
1
900
Context Engineering - Making Every Token Count
Avatar for Addy Osmani addyosmani
9
630
brightonSEO & MeasureFest 2025 - Christian Goodrich - Winning strategies for Black Friday CRO & PPC
Avatar for Christian Goodrich cargoodrich
3
88
Unsuck your backbone
Avatar for Amy Palamountain ammeep
671
58k
16th Malabo Montpellier Forum Presentation
Avatar for AKADEMIYA2063 akademiya2063
PRO
0
42
Self-Hosted WebAssembly Runtime for Runtime-Neutral Checkpoint/Restore in Edge–Cloud Continuum
Avatar for Yuki Nakata chikuwait chikuwait
0
300
My Coaching Mixtape
Avatar for mlcsv mlcsv
0
31
Primal Persuasion: How to Engage the Brain for Learning That Lasts
Avatar for Mike Taylor tmiket
0
220

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