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

Git Feature Branches as an Art

Avatar for Matthew McCullough Matthew McCullough
March 12, 2014
Programming
0
200

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
560
Your First Pull Request
Avatar for Matthew McCullough matthewmccullough
0
340
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
420
Git and GitHub Agile Workflows for HP
Avatar for Matthew McCullough matthewmccullough
0
340
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
AIエージェントのキホンから学ぶ「エージェンティックコーディング」実践入門
Avatar for Masahiro Nishimi masahiro_nishimi
7
1k
AI巻き込み型コードレビューのススメ
Avatar for Nealle nealle
2
2k
Vibe Coding - AI 驅動的軟體開發
Avatar for Micky Li mickyp100
0
190
iOSアプリでフロントエンドと仲良くする
Avatar for Ryu-nakayama ryunakayama
0
110
Claude Codeと2つの巻き戻し戦略 / Two Rewind Strategies with Claude Code
Avatar for 果物リン fruitriin
0
170
Apache Iceberg V3 and migration to V3
Avatar for Tomohiro Tanaka tomtanaka
0
200
Lambda のコードストレージ容量に気をつけましょう
Avatar for tatsuki-yamada tattwan718
0
180
登壇資料を作る時に意識していること #登壇資料_findy
Avatar for konifar konifar
4
1.8k
izumin5210のプロポーザルのネタ探し #tskaigi_msup
Avatar for izumin5210 izumin5210
1
190
Swift at Scale: Where Performance Really Comes From
Avatar for Yuta Saito kateinoigakukun
0
110
KIKI_MBSD Cybersecurity Challenges 2025
Avatar for ikema ikema
0
1.3k
Premier Disciplin for Micro Frontends Multi Version/ Framework Scenarios @OOP 2026, Munic
Avatar for Manfred Steyer manfredsteyer
PRO
0
150

Featured

See All Featured
Git: the NoSQL Database
Avatar for Brandon Keepers bkeepers
PRO
432
66k
[SF Ruby Conf 2025] Rails X
Avatar for Vladimir Dementyev palkan
1
780
Gemini Prompt Engineering: Practical Techniques for Tangible AI Outcomes
Avatar for Mfonobong Umondia mfonobong
2
290
Discover your Explorer Soul
Avatar for Emna emna__ayadi
2
1.1k
Primal Persuasion: How to Engage the Brain for Learning That Lasts
Avatar for Mike Taylor tmiket
0
260
Color Theory Basics | Prateek | Gurzu
Avatar for Gurzu gurzu
0
210
Producing Creativity
Avatar for Steve Smith orderedlist
PRO
348
40k
What's in a price? How to price your products and services
Avatar for Michael Herold michaelherold
247
13k
A Guide to Academic Writing Using Generative AI - A Workshop
Avatar for Kenji Saito ks91
PRO
0
210
The Hidden Cost of Media on the Web [PixelPalooza 2025]
Avatar for Tammy Everts tammyeverts
2
210
For a Future-Friendly Web
Avatar for Brad Frost brad_frost
182
10k
Exploring the Power of Turbo Streams & Action Cable | RailsConf2023
Avatar for Kevin Liebholz kevinliebholz
37
6.3k

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