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

Git Feature Branches as an Art

Sponsored · SiteGround - Reliable hosting with speed, security, and support you can count on. →
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
300
The Foundations of Collaboration with GitHub • SIGCSE 2014
Avatar for Matthew McCullough matthewmccullough
1
130

Other Decks in Programming

See All in Programming
AIとペアプロして処理時間を97%削減した話 #pyconshizu
Avatar for Kashun Yoshida kashewnuts
1
190
ふつうの Rubyist、ちいさなデバイス、大きな一年
Avatar for bash0C7 bash0c7
0
110
AI主導でFastAPIのWebサービスを作るときに 人間が構造化すべき境界線
Avatar for Jun okazaki okajun35
0
520
Claude Code、ちょっとした工夫で開発体験が変わる
Avatar for Toranosuke Minamikawa tigertora7571
0
200
AIコーディングの理想と現実 2026 | AI Coding: Expectations vs. Reality 2026
Avatar for Tomohisa Takaoka tomohisa
0
980
社内規程RAGの精度を73.3% → 100%に改善した話
Avatar for oharu121 oharu121
13
7.5k
PostgreSQL を使った快適な go test 環境を求めて
Avatar for Kotaro Otaka otakakot
0
390
Rubyと楽しいをつくる / Creating joy with Ruby
Avatar for chobishiba chobishiba
0
200
要求定義・仕様記述・設計・検証の手引き - 理論から学ぶ明確で統一された成果物定義
Avatar for Kuniwak orgachem
PRO
21
10k
JPUG勉強会 OSSデータベースの内部構造を理解しよう
Avatar for Atsushi Ogawa oga5
2
230
AI時代でも変わらない技術コミュニティの力～10年続く“ゆるい”つながりが生み出す価値
Avatar for Takehata Naoto n_takehata
2
630
コーディングルールの鮮度を保ちたい / keep-fresh-go-internal-conventions
Avatar for NAGATA Hiroaki handlename
0
150

Featured

See All Featured
Bash Introduction
Avatar for André Augusto Costa Santos 62gerente
615
210k
What the history of the web can teach us about the future of AI
Avatar for Ines Montani inesmontani
PRO
1
450
Typedesign – Prime Four
Avatar for Hannes Fritz hannesfritz
42
3k
Testing 201, or: Great Expectations
Avatar for Joseph Mastey jmmastey
46
8.1k
Effective software design: The role of men in debugging patriarchy in IT @ Voxxed Days AMS
Avatar for Kenny Baas-Schwegler baasie
0
240
Into the Great Unknown - MozCon
Avatar for Noah Learner thekraken
40
2.3k
Why You Should Never Use an ORM
Avatar for John Nunemaker jnunemaker
PRO
61
9.8k
Organizational Design Perspectives: An Ontology of Organizational Design Elements
Avatar for Dr. Kim W Petersen kimpetersen
PRO
1
620
Practical Orchestrator
Avatar for Shlomi Noach shlominoach
191
11k
10 Git Anti Patterns You Should be Aware of
Avatar for Lemi Orhan Ergin lemiorhan
PRO
659
61k
AI: The stuff that nobody shows you
Avatar for John Nunemaker jnunemaker
PRO
3
350
Let's Do A Bunch of Simple Stuff to Make Websites Faster
Avatar for Chris Coyier chriscoyier
508
140k

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