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
180

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
530
Your First Pull Request
Avatar for Matthew McCullough matthewmccullough
0
320
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
400
Git and GitHub Agile Workflows for HP
Avatar for Matthew McCullough matthewmccullough
0
320
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
120

Other Decks in Programming

See All in Programming
関数の挙動書き換える
Avatar for takato fukui takatofukui
4
750
Promise.tryで実現する新しいエラーハンドリング New error handling with Promise try
Avatar for おおいし bicstone
3
1.7k
Why Kotlin? 電子カルテを Kotlin で開発する理由 / Why Kotlin? at Henry
Avatar for Agata Naomichi agatan
1
110
無秩序からの脱却 / Emergence from chaos
Avatar for nrs nrslib
1
9.4k
Nitro v3
Avatar for kazupon kazupon
2
330
Feature Flags Suck! - KubeCon Atlanta 2025
Avatar for Pete Hodgson phodgson
0
170
Combinatorial Interview Problems with Backtracking Solutions - From Imperative Procedural Programming to Declarative Functional Programming - Part 1
Avatar for Philip Schwarz philipschwarz
PRO
0
110
Web エンジニアが JavaScript で AI Agent を作る / JSConf JP 2025 sponsor session
Avatar for izumin5210 izumin5210
4
2k
Honoを技術選定したAI要件定義プラットフォームAcsimでの意思決定
Avatar for Tadashi Shigeoka codenote
0
270
Building AI with AI
Avatar for Ines Montani inesmontani
PRO
1
260
手軽に積ん読を増やすには？/読みたい本と付き合うには？
Avatar for hideki kinjyo o0h
PRO
1
110
[SF Ruby Conf 2025] Rails X
Avatar for Vladimir Dementyev palkan
0
370

Featured

See All Featured
Build The Right Thing And Hit Your Dates
Avatar for Maggie C. maggiecrowley
38
2.9k
Rebuilding a faster, lazier Slack
Avatar for samanthasiow samanthasiow
84
9.3k
Let's Do A Bunch of Simple Stuff to Make Websites Faster
Avatar for Chris Coyier chriscoyier
508
140k
Building an army of robots
Avatar for Kyle Neath kneath
306
46k
Measuring & Analyzing Core Web Vitals
Avatar for Philip Tellis bluesmoon
9
680
Distributed Sagas: A Protocol for Coordinating Microservices
Avatar for Caitie McCaffrey caitiem20
333
22k
Writing Fast Ruby
Avatar for Erik Berlin sferik
630
62k
Learning to Love Humans: Emotional Interface Design
Avatar for Aarron Walter aarron
274
41k
BBQ
Avatar for Matthew Crist matthewcrist
89
9.9k
[RailsConf 2023 Opening Keynote] The Magic of Rails
Avatar for Eileen M. Uchitelle eileencodes
31
9.8k
KATA
Avatar for Megan Lloyd mclloyd
PRO
32
15k
Exploring the Power of Turbo Streams & Action Cable | RailsConf2023
Avatar for Kevin Liebholz kevinliebholz
36
6.1k

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