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

Git Feature Branches as an Art

Bededa744012c87721d68f69342f81b0?s=47 Matthew McCullough
March 12, 2014
Programming
0
130

Git Feature Branches as an Art

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

Bededa744012c87721d68f69342f81b0?s=128

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
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
1
330
Collaborative Software Development in a Social World at the Utah JUG
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
2
130
Git and GitHub Platform Review
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
1
270
Your First Pull Request
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
0
210
Git and GitHub Workflows at the Utah JUG
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
1
580
Agile-ish life at GitHub
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
2
260
Git and GitHub Agile Workflows for HP
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
0
220
Writing Tools on the GitHub Platform
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
0
190
The Foundations of Collaboration with GitHub • SIGCSE 2014
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
1
90

Other Decks in Programming

See All in Programming
About Type Syntax Proposal
893f54413c2bd9ba41d11d753aacaf2c?s=48 quramy
1
1.2k
You CANt teach an old dog new tricks
Bd5b8981a308c94b642befb656d8cf8f?s=48 michaelbukachi
0
120
UI State Modeling 어떤게 좋을까?
Afcab07a7473e163949d85424a81cb85?s=48 laco2951
1
240
TechFeed Conference 2022 - Kotlin Experimental
D4133d8efb46ae872d7a563b619bfc83?s=48 jmatsu
0
830
CLI構築のススメ
1bf2570004ba1a6261e5a252deef2719?s=48 nyankotaro
1
220
あなたの会社の古いシステム、なんとかしませんか？～システム刷新から考えるDX化への道筋とバリエーション～/webinar20220420-systems
Dcbf2269af2483cabf43128ad1718c11?s=48 grapecity_dev
0
130
Enterprise Angular: Frontend Moduliths with Nx and Standalone Components @jax2022
15934fa2aa7b2ce21f091e9b7cffa856?s=48 manfredsteyer
PRO
0
310
Unity Localization で多言語対応実装しよう / xrdnk-yokohamaunity-lt10-20220513
270b0c7883545117a9a618dc7ca7cc83?s=48 xrdnk
0
160
アプリのログをチーム外で活用してもらうためにやったこと
2f8b61ad31dd9c6ada4a90af746290fd?s=48 shotakashihara
0
190
Why declarative UI frameworks?
6233177bc63ec02060206adef9108601?s=48 tkuenneth
0
150
あなたの会社の古いシステム、なんとかしませんか？～システム刷新から考えるDX化への道筋とバリエーション～/webinar20220420-grapecity
Dcbf2269af2483cabf43128ad1718c11?s=48 grapecity_dev
0
140
Oculus Interaction SDK 概説 / xrdnk-caunity-LT4
270b0c7883545117a9a618dc7ca7cc83?s=48 xrdnk
0
250

Featured

See All Featured
Streamline your AJAX requests with AmplifyJS and jQuery
9cde37f47e4a800ea081ea42de8d749a?s=48 dougneiner
125
8.5k
Let's Do A Bunch of Simple Stuff to Make Websites Faster
8081b26e05bb4354f7d65ffc34cbbd67?s=48 chriscoyier
498
130k
The Cult of Friendly URLs
Ded01cdab114abe4ec13511e4c25b9bb?s=48 andyhume
68
4.7k
Web Components: a chance to create the future
E190023b66e2b8aa73a842b106920c93?s=48 zenorocha
303
40k
Large-scale JavaScript Application Architecture
96270e4c3e5e9806cf7245475c00b275?s=48 addyosmani
499
110k
Building Better People: How to give real-time feedback that sticks.
9952dfcd5d338f8a8e7175c8a8f65fb5?s=48 wjessup
343
17k
How GitHub (no longer) Works
78b475797a14c84799063c7cd073962f?s=48 holman
296
140k
The Invisible Side of Design
B3d6434763caa0ef5dc4b792662c49f7?s=48 smashingmag
289
48k
Done Done
282d599b414022eba5096510f675b6e2?s=48 chrislema
174
14k
YesSQL, Process and Tooling at Scale
D09fad3e36ae6841f54820be0e907f7a?s=48 rocio
157
12k
5 minutes of I Can Smell Your CMS
465724d73fe3a92c0879fdfb43a3a6f3?s=48 philhawksworth
196
18k
XXLCSS - How to scale CSS and keep your sanity
1b8ad785acdd1ce1c99914b1c2a4e10e?s=48 sugarenia
236
1M

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