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
150

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
370
Collaborative Software Development in a Social World at the Utah JUG
matthewmccullough
2
150
Git and GitHub Platform Review
matthewmccullough
1
400
Your First Pull Request
matthewmccullough
0
270
Git and GitHub Workflows at the Utah JUG
matthewmccullough
1
780
Agile-ish life at GitHub
matthewmccullough
2
340
Git and GitHub Agile Workflows for HP
matthewmccullough
0
280
Writing Tools on the GitHub Platform
matthewmccullough
0
240
The Foundations of Collaboration with GitHub • SIGCSE 2014
matthewmccullough
1
100

Other Decks in Programming

See All in Programming
menu基盤チームによるGoogle Cloudの活用事例~Application Integration, Cloud Tasks編~
yoshifumi_ishikura
0
110
Scalaから始めるOpenFeature入門 / Scalaわいわい勉強会 #4
arthur1
1
340
CQRS+ES の力を使って効果を感じる / Feel the effects of using the power of CQRS+ES
seike460
PRO
0
140
rails statsで大解剖 🔍 “B/43流” のRailsの育て方を歴史とともに振り返ります
shoheimitani
2
940
テストコード文化を0から作り、変化し続けた組織
kazatohiei
2
1.5k
ブラウザ単体でmp4書き出すまで - muddy-web - 2024-12
yue4u
3
480
どうして手を動かすよりもチーム内のコードレビューを優先するべきなのか
okashoi
3
150
tidymodelsによるtidyな生存時間解析 / Japan.R2024
dropout009
1
790
バグを見つけた？それAppleに直してもらおう！
uetyo
0
180
KubeCon + CloudNativeCon NA 2024 Overview at Kubernetes Meetup Tokyo #68 / amsy810_k8sjp68
masayaaoyama
0
260
Webエンジニア主体のモバイルチームの 生産性を高く保つためにやったこと
igreenwood
0
340
各クラウドサービスにおける.NETの対応と見解
ymd65536
0
110

Featured

See All Featured
I Don’t Have Time: Getting Over the Fear to Launch Your Podcast
jcasabona
29
2k
Designing Experiences People Love
moore
138
23k
Adopting Sorbet at Scale
ufuk
73
9.1k
Evolution of real-time – Irina Nazarova, EuRuKo, 2024
irinanazarova
5
450
Automating Front-end Workflow
addyosmani
1366
200k
Why Our Code Smells
bkeepers
PRO
335
57k
Reflections from 52 weeks, 52 projects
jeffersonlam
347
20k
The Illustrated Children's Guide to Kubernetes
chrisshort
48
48k
Done Done
chrislema
181
16k
A Modern Web Designer's Workflow
chriscoyier
693
190k
Rails Girls Zürich Keynote
gr2m
94
13k
CoffeeScript is Beautiful & I Never Want to Write Plain JavaScript Again
sstephenson
159
15k

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