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
310
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
2
130
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
81

Other Decks in Programming

See All in Programming
347a1b64f3a6e38981bc99b53919e2b1?s=48 azdaroth
0
150
1b838da2065660793d5b26f2cdc32de7?s=48 pyama86
2
270
804bf3fd2baebf9a27e4774553688d37?s=48 saki4869
0
200
E473e5af1263c050599921981db46068?s=48 akatsukinewgrad
0
230
4d40d82cc3c676e8a67ffc2a473bf423?s=48 kyoheig3
0
440
6ef7914944df6af99a2ca81e98087332?s=48 taoshotaro
1
370
Eae7b6aeee72d3081b01d09a2d675f9a?s=48 akkeylab
0
370
04df7340898eac3a0536d3b47c55501c?s=48 hirotokirimaru
1
440
3742ae4f74e584aed4f41c405232c3bb?s=48 yaamaa
0
460
2102a6b8760bd6f57f672805723dd83a?s=48 line_developers_tw
1
510
7eca3e06edc3c69004aaf57de51900c2?s=48 ajstarks
2
550
8ad631306f5ab343446a967b98e64c0e?s=48 hollodotme
1
110

Featured

See All Featured
9cde37f47e4a800ea081ea42de8d749a?s=48 dougneiner
119
7.8k
Fde6c3a50ca518a909ef35c22c0ee0e4?s=48 destraynor
223
47k
5f83ef806155b403c3393160ce51f955?s=48 jlugia
216
16k
91cefdf141106fa10674aae74ce05890?s=48 yeseniaperezcruz
302
31k
Aebc2d07a50011e2a30d38435fde564a?s=48 jrom
114
7.1k
0fe2973fa8d27d96547e43322341183a?s=48 swwweet
206
6.8k
Eb8975af8e49e19e3dd6b6b84a542e26?s=48 qrush
285
18k
245cee81a9c424266e5e401d844ea881?s=48 lara
590
61k
761be20b5ebd271008bcee1244fc5b52?s=48 matthewcrist
73
7.5k
2f5463832ccb768ccb4a1ca3607c27ef?s=48 jacobian
255
20k
E43f8dfd01057f8304f5f8fb9a294d7d?s=48 jeffersonlam
328
15k
78b475797a14c84799063c7cd073962f?s=48 holman
448
130k

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