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
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
1
320
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
2
130
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
1
260
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
0
200
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
1
560
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
2
250
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
0
210
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
0
190
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
1
83

Other Decks in Programming

See All in Programming
75baf8a56acce7086013da05fd125af5?s=48 dhmegane
0
100
Bf5ee9059859ed5d855b5ff4680e63e2?s=48 track3jyo
3
220
Dee9a95c0e5483692c54cc5e60e8b09e?s=48 yusuke57
0
120
8a43d544df4886ea5ef714e78f3420a7?s=48 chimerast
0
320
24b82e535177c6be997ca4ec43d8df6b?s=48 tomoyanonymous
0
330
7eca3e06edc3c69004aaf57de51900c2?s=48 ajstarks
2
750
635e53b96114c922fa5486b418895960?s=48 fadis
3
1.8k
0063efb4c7066273b877fdabcdcd15b3?s=48 dora1998
0
160
88ad4f75d7c84fcf560bb6205c52e8c1?s=48 dnskimo
8
1.5k
C44d9ff0fb47045ae04e3183694c7d68?s=48 wafuwafu13
1
130
Ec2fcdc4ea7905b289967a2c4c43e154?s=48 sgeengineer
1
180
7f408bc67dc9ae3b288ee92d16d3c4c2?s=48 deepu105
0
230

Featured

See All Featured
C0390e8b11079f8761c0cd3274ed61cb?s=48 productmarketing
6
760
9128d500301ae51524e887bb680f471d?s=48 caitiem20
311
17k
465724d73fe3a92c0879fdfb43a3a6f3?s=48 philhawksworth
192
8.9k
2bb923c57a1fdc3a2eb484bb8d565fd2?s=48 ufuk
56
5.5k
Fde6c3a50ca518a909ef35c22c0ee0e4?s=48 destraynor
146
19k
465724d73fe3a92c0879fdfb43a3a6f3?s=48 philhawksworth
190
17k
7cbd3f5f922d798cc312eaf596de7ae6?s=48 iamctodd
22
2.1k
1f74b13f1e5c6c69cb5d7fbaabb1e2cb?s=48 sferik
612
55k
61857dafbd287b3027c4dcea9008ad3c?s=48 carmenhchung
34
1.6k
A9a491b0fcbe0fbce3d64063a37add99?s=48 rmw
12
860
8081b26e05bb4354f7d65ffc34cbbd67?s=48 chriscoyier
683
180k
168ccec72eee0530b818d44f3fedaacf?s=48 shlominoach
176
7.6k

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