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
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
520
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
830
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
310
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
『毎日の移動』を支えるGoバックエンド内製開発
Avatar for yutautsugi yutautsugi
2
250
高度なUI/UXこそHotwireで作ろう Kaigi on Rails 2025
Avatar for Naofumi Kagami naofumi
4
4.1k
開発生産性を上げるための生成AI活用術
Avatar for starfish719 starfish719
3
950
Advance Your Career with Open Source
Avatar for ivargrimstad ivargrimstad
0
520
CSC509 Lecture 05
Avatar for Javier Gonzalez-Sanchez javiergs
PRO
0
300
なぜあの開発者はDevRelに伴走し続けるのか / Why Does That Developer Keep Running Alongside DevRel?
Avatar for nrs nrslib
3
400
理論と実務のギャップを超える
Avatar for kmuto eycjur
0
130
「ちょっと古いから」って避けてた技術書、今だからこそ読もう
Avatar for もっち mottyzzz
10
6.7k
アメ車でサンノゼを走ってきたよ！
Avatar for Shigure Shimotori s_shimotori
0
220
組込みだけじゃない！TinyGo で始める無料クラウド開発入門
Avatar for Kotaro Otaka otakakot
0
260
明日から始めるリファクタリング
Avatar for ryounasso ryounasso
0
140
What's new in Spring Modulith?
Avatar for Oliver Drotbohm olivergierke
1
150

Featured

See All Featured
Six Lessons from altMBA
Avatar for Skipper Chong Warson skipperchong
28
4k
Fantastic passwords and where to find them - at NoRuKo
Avatar for Phil Nash philnash
52
3.4k
Scaling GitHub
Avatar for Zach Holman holman
463
140k
Chrome DevTools: State of the Union 2024 - Debugging React & Beyond
Avatar for Addy Osmani addyosmani
7
900
Statistics for Hackers
Avatar for Jake VanderPlas jakevdp
799
220k
Building Adaptive Systems
Avatar for Chris Keathley keathley
43
2.8k
Docker and Python
Avatar for Tania Allard trallard
46
3.6k
A Modern Web Designer's Workflow
Avatar for Chris Coyier chriscoyier
697
190k
The Cost Of JavaScript in 2023
Avatar for Addy Osmani addyosmani
54
9k
Raft: Consensus for Rubyists
Avatar for Patrick Van Stee vanstee
139
7.1k
Visualization
Avatar for Eitan Lees eitanlees
149
16k
Connecting the Dots Between Site Speed, User Experience & Your Business [WebExpo 2025]
Avatar for Tammy Everts tammyeverts
9
590

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