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
310
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
2
120
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
1
250
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
0
190
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
1
550
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
2
240
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
0
200
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
0
180
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
1
75

Other Decks in Programming

See All in Programming
0fb2ce77513181750c384115cd0bc937?s=48 ksukenobe
2
280
Beb422437c1dfb5366f197919e41ac50?s=48 lilobase
1
330
89f41026db2c96853402524fca4a2ff8?s=48 brentchang
0
1.1k
3cfad86677c5966ecfe9b81955fa3489?s=48 youkan2002
0
220
A2407c5cea2c38ce15d85a5df9da820a?s=48 fumiyakume
0
540
E834b4b7cfcba6918f01f45d2916c302?s=48 f110
2
170
49df09ab2eadd025342b9b3387936eb9?s=48 stefafafan
0
380
1fe64ebb176498be5f73ab51986c6b7b?s=48 davidfowl
9
3.6k
44f37c1fe3a6a56376bb41a338741355?s=48 ahiru
3
330
D79e3b0b78ca7027eb61d73028d45ad6?s=48 uchi_k
2
920
841002bf24bb562253de7eb3c17ceae6?s=48 kyomo
1
160
8a6e58b272b266faf22d8a3b2927624f?s=48 j796160836
1
570

Featured

See All Featured
766b9746b59e6f09e280cd33cf4ed419?s=48 skipperchong
5
550
3d4519fd34b76fb265fc0237f3792bd4?s=48 danielanewman
197
19k
E4f5d494ebdc9e7cce1aecf3ce3e8bc1?s=48 shpigford
366
42k
0bce06bd06ee7a2c4f5500f25dcf7f18?s=48 paulrobertlloyd
71
3.5k
D67fff74178013024d833b3eec6cf27f?s=48 lynnandtonic
267
16k
9cde37f47e4a800ea081ea42de8d749a?s=48 dougneiner
55
5.3k
6804f1775cb4babfcc3851298566fbce?s=48 tanoku
85
8.4k
Aebc2d07a50011e2a30d38435fde564a?s=48 jrom
113
7k
96270e4c3e5e9806cf7245475c00b275?s=48 addyosmani
1348
190k
465724d73fe3a92c0879fdfb43a3a6f3?s=48 philhawksworth
190
8.7k
C4de88ea47538e4594750e3861a341c8?s=48 brettharned
91
2.8k
016edace78ffe826f2348d1e0c504afd?s=48 maggiecrowley
5
310

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