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

Git Feature Branches as an Art

Matthew McCullough
March 12, 2014
Programming
0
160

Git Feature Branches as an Art

Slides from Matthew's Fluent (http://fluentconf.com/fluent2014) talk on Feature Branches in Git.

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
matthewmccullough
1
380
Collaborative Software Development in a Social World at the Utah JUG
matthewmccullough
2
160
Git and GitHub Platform Review
matthewmccullough
1
470
Your First Pull Request
matthewmccullough
0
280
Git and GitHub Workflows at the Utah JUG
matthewmccullough
1
810
Agile-ish life at GitHub
matthewmccullough
2
370
Git and GitHub Agile Workflows for HP
matthewmccullough
0
290
Writing Tools on the GitHub Platform
matthewmccullough
0
250
The Foundations of Collaboration with GitHub • SIGCSE 2014
matthewmccullough
1
110

Other Decks in Programming

See All in Programming
State of Namespace
tagomoris
4
1.8k
ミリしらMCP勉強会
watany
4
770
サービスレベルを管理してアジャイルを加速しよう！！ / slm-accelerate-agility
tomoyakitaura
1
180
Exit 8 for SwiftUI
ojun9
0
130
複雑なフォームの jotai 設計 / Designing jotai(state) for Complex Forms #layerx_frontend
izumin5210
4
1k
Module Boundaries and Architecture with Forensic Analysis @NxSummit Amsterdam 2025
manfredsteyer
PRO
0
100
趣味全開のAITuber開発
kokushin
0
200
RubyKaigi Dev Meeting 2025
tenderlove
1
170
Being an ethical software engineer
xgouchet
PRO
0
210
ComposeでWebアプリを作る技術
tbsten
0
110
AWS で実現する 安全な AI エージェントの作り方 〜 Bedrock Engineer の実装例を添えて 〜 / how-to-build-secure-ai-agents
gawa
8
820
Chrome Extension Techniques from Hell
moznion
1
160

Featured

See All Featured
"I'm Feeling Lucky" - Building Great Search Experiences for Today's Users (#IAC19)
danielanewman
227
22k
Java REST API Framework Comparison - PWX 2021
mraible
30
8.5k
Intergalactic Javascript Robots from Outer Space
tanoku
270
27k
Unsuck your backbone
ammeep
670
57k
How to Ace a Technical Interview
jacobian
276
23k
Automating Front-end Workflow
addyosmani
1369
200k
How GitHub (no longer) Works
holman
314
140k
Creating an realtime collaboration tool: Agile Flush - .NET Oxford
marcduiker
30
2k
Adopting Sorbet at Scale
ufuk
76
9.3k
Building Flexible Design Systems
yeseniaperezcruz
329
38k
VelocityConf: Rendering Performance Case Studies
addyosmani
328
24k
Sharpening the Axe: The Primacy of Toolmaking
bcantrill
41
2.2k

Transcript

  1. Feature Branches
 as an art with Matthew McCullough at Fluent

    2014

  2. education@github.com 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