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
170

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
390
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
490
Your First Pull Request
Avatar for Matthew McCullough matthewmccullough
0
290
Git and GitHub Workflows at the Utah JUG
Avatar for Matthew McCullough matthewmccullough
1
820
Agile-ish life at GitHub
Avatar for Matthew McCullough matthewmccullough
2
390
Git and GitHub Agile Workflows for HP
Avatar for Matthew McCullough matthewmccullough
0
300
Writing Tools on the GitHub Platform
Avatar for Matthew McCullough matthewmccullough
0
270
The Foundations of Collaboration with GitHub • SIGCSE 2014
Avatar for Matthew McCullough matthewmccullough
1
120

Other Decks in Programming

See All in Programming
#kanrk08 / 公開版 PicoRubyとマイコンでの自作トレーニング計測装置を用いたワークアウトの理想と現実
Avatar for bash0C7 bash0c7
1
690
PostgreSQLのRow Level SecurityをPHPのORMで扱う Eloquent vs Doctrine #phpcon #track2
Avatar for Hiromi Hishida 77web
2
500
PipeCDのプラグイン化で目指すところ
Avatar for Warashi warashi
1
260
A full stack side project webapp all in Kotlin (KotlinConf 2025)
Avatar for Dan Kim dankim
0
100
チームで開発し事業を加速するための"良い"設計の考え方 @ サポーターズCoLab 2025-07-08
Avatar for Agata Naomichi agatan
0
190
Webの外へ飛び出せ NativePHPが切り拓くPHPの未来
Avatar for Takuya Katsusa takuyakatsusa
2
530
Team topologies and the microservice architecture: a synergistic relationship
Avatar for Chris Richardson cer
PRO
0
1.2k
CursorはMCPを使った方が良いぞ
Avatar for taiga taigakono
1
240
Kotlin エンジニアへ送る：Swift 案件に参加させられる日に備えて～似てるけど色々違う Swift の仕様 / from Kotlin to Swift
Avatar for Elvis Shi lovee
1
260
RailsGirls IZUMO スポンサーLT
Avatar for 16bit_idol 16bitidol
0
170
dbt民主化とLLMによる開発ブースト ~ AI Readyな分析サイクルを目指して ~
Avatar for yosh_yumyum yoshyum
3
790
Composerが「依存解決」のためにどんな工夫をしているか #phpcon
Avatar for hideki kinjyo o0h
PRO
1
250

Featured

See All Featured
Let's Do A Bunch of Simple Stuff to Make Websites Faster
Avatar for Chris Coyier chriscoyier
507
140k
Product Roadmaps are Hard
Avatar for C. Todd Lombardo iamctodd
PRO
54
11k
Chrome DevTools: State of the Union 2024 - Debugging React & Beyond
Avatar for Addy Osmani addyosmani
7
730
Helping Users Find Their Own Way: Creating Modern Search Experiences
Avatar for Dan Newman danielanewman
29
2.7k
Design and Strategy: How to Deal with People Who Don’t "Get" Design
Avatar for Morgane Peng morganepeng
130
19k
How To Stay Up To Date on Web Technology
Avatar for Chris Coyier chriscoyier
790
250k
Stop Working from a Prison Cell
Avatar for Chris Michel hatefulcrawdad
270
21k
I Don’t Have Time: Getting Over the Fear to Launch Your Podcast
Avatar for Joe Casabona jcasabona
32
2.4k
Optimizing for Happiness
Avatar for Tom Preston-Werner mojombo
379
70k
The Psychology of Web Performance [Beyond Tellerrand 2023]
Avatar for Tammy Everts tammyeverts
48
2.9k
Java REST API Framework Comparison - PWX 2021
Avatar for Matt Raible mraible
31
8.7k
KATA
Avatar for Megan Lloyd mclloyd
30
14k

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