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
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
NIKKEI Tech Talk#38
Avatar for cipepser cipepser
0
360
CSC305 Lecture 10
Avatar for Javier Gonzalez-Sanchez javiergs
PRO
0
330
퇴근 후 1억이 거래되는 서비스 만들기 | 내가 AI를 사용하는 방법
Avatar for Seungmin 마량 maryang
2
330
実践Claude Code：20の失敗から学ぶAIペアプログラミング
Avatar for 武田隆志 takedatakashi
18
9.4k
The Past, Present, and Future of Enterprise Java
Avatar for ivargrimstad ivargrimstad
0
490
マイベストのシンプルなデータ基盤の話 - Googleスイートとのつき合い方 / mybest-simple-data-architecture-google-nized
Avatar for snhryt snhryt
0
120
Developer Joy - The New Paradigm
Avatar for Holly Cummins hollycummins
1
400
CSC305 Lecture 12
Avatar for Javier Gonzalez-Sanchez javiergs
PRO
0
250
マンガアプリViewerの大画面対応を考える
Avatar for kk__777 kk__777
0
440
EMこそClaude Codeでコード調査しよう
Avatar for shibayu36 shibayu36
0
550
Pythonに漸進的に型をつける
Avatar for Nealle nealle
1
150
Module Proxyのマニアックな話 / Niche Topics in Module Proxy
Avatar for kuro kuro_kurorrr
0
1.1k

Featured

See All Featured
Bash Introduction
Avatar for André Augusto Costa Santos 62gerente
615
210k
Optimizing for Happiness
Avatar for Tom Preston-Werner mojombo
379
70k
Bootstrapping a Software Product
Avatar for Garrett Dimon garrettdimon
PRO
307
110k
Facilitating Awesome Meetings
Avatar for Lara Hogan lara
57
6.6k
A designer walks into a library…
Avatar for Paul Jervis Heath pauljervisheath
209
24k
Fight the Zombie Pattern Library - RWD Summit 2016
Avatar for Marcelo Somers marcelosomers
234
17k
Raft: Consensus for Rubyists
Avatar for Patrick Van Stee vanstee
140
7.2k
ピンチをチャンスに：未来をつくるプロダクトロードマップ #pmconf2020
Avatar for Aki / @LoveIdahoBurger aki_iinuma
127
54k
Six Lessons from altMBA
Avatar for Skipper Chong Warson skipperchong
29
4k
We Have a Design System, Now What?
Avatar for Morgane Peng morganepeng
54
7.9k
The Illustrated Children's Guide to Kubernetes
Avatar for Chris Short chrisshort
51
51k
ReactJS: Keep Simple. Everything can be a component!
Avatar for Pedro Nauck pedronauck
666
130k

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