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
500
Your First Pull Request
Avatar for Matthew McCullough matthewmccullough
0
300
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
310
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
CDK引数設計道場100本ノック
Avatar for kazuho cryer-shinozuka badmintoncryer
2
590
Claude Code派？Gemini CLI派？ みんなで比較LT会！_20250716
Avatar for じゅん junholee
1
760
#QiitaBash TDDで(自分の)開発がどう変わったか
Avatar for Tommy(sigma) ryosukedtomita
1
180
PHPカンファレンス関西2025　基調講演
Avatar for SUGIMOTO Kei sugimotokei
6
1k
構文解析器入門
Avatar for ydah ydah
7
1.9k
[Codecon - 2025] Como não odiar seus testes
Avatar for Camila Campos camilacampos
0
100
AIコーディングエージェント全社導入とセキュリティ対策
Avatar for hikae hikaruegashira
15
8.7k
TypeScriptでDXを上げろ！ Hono編
Avatar for Yusuke Wada yusukebe
3
890
構造化・自動化・ガードレール - Vibe Coding実践記 -
Avatar for ふくすけ tonegawa07
0
160
はじめてのWeb API体験 ー 飲食店検索アプリを作ろうー
Avatar for Aki Nakahara akinko_0915
0
180
バイブコーディングの正体——AIエージェントはソフトウェア開発を変えるか？
Avatar for Shinichi Takayanagi stakaya
2
210
AIに安心して任せるためにTypeScriptで一意な型を作ろう
Avatar for Yuki Yata arfes0e2b3c
0
290

Featured

See All Featured
Art, The Web, and Tiny UX
Avatar for Lynn Fisher lynnandtonic
301
21k
Put a Button on it: Removing Barriers to Going Fast.
Avatar for kastner kastner
60
3.9k
Documentation Writing (for coders)
Avatar for Carmen Chung carmenintech
72
4.9k
Helping Users Find Their Own Way: Creating Modern Search Experiences
Avatar for Dan Newman danielanewman
29
2.8k
The Web Performance Landscape in 2024 [PerfNow 2024]
Avatar for Tammy Everts tammyeverts
8
720
The Invisible Side of Design
Avatar for Vitaly Friedman smashingmag
301
51k
Imperfection Machines: The Place of Print at Facebook
Avatar for Scott Boms scottboms
267
13k
個人開発の失敗を避けるイケてる考え方 / tips for indie hackers
Avatar for panda_program panda_program
110
19k
[RailsConf 2023] Rails as a piece of cake
Avatar for Vladimir Dementyev palkan
56
5.7k
Facilitating Awesome Meetings
Avatar for Lara Hogan lara
54
6.5k
How STYLIGHT went responsive
Avatar for nonsquared nonsquared
100
5.7k
Bash Introduction
Avatar for André Augusto Costa Santos 62gerente
613
210k

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