Upgrade to PRO for Only $50/Year—Limited-Time Offer! 🔥

Git Feature Branches as an Art

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
400
Collaborative Software Development in a Social World at the Utah JUG
Avatar for Matthew McCullough matthewmccullough
2
170
Git and GitHub Platform Review
Avatar for Matthew McCullough matthewmccullough
1
540
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
840
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
280
The Foundations of Collaboration with GitHub • SIGCSE 2014
Avatar for Matthew McCullough matthewmccullough
1
130

Other Decks in Programming

See All in Programming
Rediscover the Console - SymfonyCon Amsterdam 2025
Avatar for Robin Chalas chalasr
2
160
C-Shared Buildで突破するAI Agent バックテストの壁
Avatar for po3rin po3rin
0
390
How Software Deployment tools have changed in the past 20 years
Avatar for Geshan Manandhar geshan
0
29k
【Streamlit x Snowflake】データ基盤からアプリ開発・AI活用まで、すべてをSnowflake内で実現
Avatar for Ayumu Yamaguchi ayumu_yamaguchi
1
120
まだ間に合う！Claude Code元年をふりかえる
Avatar for nogu nogu66
5
820
JETLS.jl ─ A New Language Server for Julia
Avatar for abap34 abap34
1
390
非同期処理の迷宮を抜ける: 初学者がつまづく構造的な原因
Avatar for PADAone pd1xx
1
710
TypeScriptで設計する 堅牢さとUXを両立した非同期ワークフローの実現
Avatar for Matsumoto Moeka moeka__c
6
3k
Go コードベースの構成と AI コンテキスト定義
Avatar for ANDPAD inc andpad
0
120
Context is King？ 〜Verifiability時代とコンテキスト設計 / Beyond "Context is King"
Avatar for r-kagaya rkaga
9
1.1k
Giselleで作るAI QAアシスタント 〜 Pull Requestレビューに継続的QAを
Avatar for Tadashi Shigeoka codenote
0
170
生成AIを利用するだけでなく、投資できる組織へ
Avatar for pospome pospome
2
320

Featured

See All Featured
Building a Scalable Design System with Sketch
Avatar for Laura Van Doore lauravandoore
463
34k
Being A Developer After 40
Avatar for Adrian Kosmaczewski akosma
91
590k
Music & Morning Musume
Avatar for Bryan Veloso bryan
46
7k
Why You Should Never Use an ORM
Avatar for John Nunemaker jnunemaker
PRO
61
9.6k
Improving Core Web Vitals using Speculation Rules API
Avatar for Sergey Chernyshev sergeychernyshev
21
1.3k
Large-scale JavaScript Application Architecture
Avatar for Addy Osmani addyosmani
515
110k
The Invisible Side of Design
Avatar for Vitaly Friedman smashingmag
302
51k
How Fast Is Fast Enough? [PerfNow 2025]
Avatar for Tammy Everts tammyeverts
3
390
Writing Fast Ruby
Avatar for Erik Berlin sferik
630
62k
How to Ace a Technical Interview
Avatar for Jacob Kaplan-Moss jacobian
280
24k
The Language of Interfaces
Avatar for Des Traynor destraynor
162
25k
Docker and Python
Avatar for Tania Allard trallard
47
3.7k

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