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
330
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
2
130
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
1
260
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
0
200
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
1
570
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
2
250
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
0
220
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
0
190
Bededa744012c87721d68f69342f81b0?s=48 matthewmccullough
1
87

Other Decks in Programming

See All in Programming
Ff0453fcbf27a84de92b9cc1f2aed9af?s=48 koike91
1
450
8959f99d4bf2e7445e5b847d3ac18dde?s=48 pkino
0
210
D4b671ba3e441fa2aad85d7508ab67a2?s=48 treastrain
5
490
028088964f255d677d471558da865b72?s=48 satoshin
2
160
8f2c3621c8a56710b8fc8b993f400ef3?s=48 hirokiabe
0
410
E66449b8260b07a1cf51c5ab5eaa8180?s=48 dunglas
3
2.9k
A2cd163fd3cfca5204b0d8f0c17eea29?s=48 yujif
2
720
75f5fb3ddda052e46f1daed314ae69ab?s=48 beberlei
0
140
Ff2c33d63aa8e06c90f4638c6266b4fb?s=48 sheharyar
1
410
50443a0c666aa1020f2f757582e6e45c?s=48 suzukiot
0
190
1a1d418bdf51cbf8fce1317f6c80a907?s=48 satoshi0212
3
280
7850a83d81b034248782d63e7dcf7974?s=48 tatsuya4451
0
490

Featured

See All Featured
Dafc4723e9a1c067796c0fec6f509774?s=48 lemiorhan
633
49k
B3d6434763caa0ef5dc4b792662c49f7?s=48 smashingmag
235
18k
F383c6a4dc55e331bbe2987b622cee6b?s=48 stephaniewalter
263
11k
Ecdea9b9714877b86cee08458f085481?s=48 trallard
24
1.2k
7cbd3f5f922d798cc312eaf596de7ae6?s=48 iamctodd
28
2.8k
06f8b41980eb4c577fa40c41d5030c19?s=48 keathley
25
910
8081b26e05bb4354f7d65ffc34cbbd67?s=48 chriscoyier
780
240k
39488f9d172ab92fd352f2cd7b73258d?s=48 mza
82
4.4k
168ccec72eee0530b818d44f3fedaacf?s=48 shlominoach
177
8.1k
6bb82b13cda86d3b821fa44100335ddf?s=48 thoeni
6
930
44b54d2ffcb7857004071cc6795dde11?s=48 cassininazir
350
20k
C7393b7ba7ec9c8890dd77d209fbb3c9?s=48 maltzj
504
37k

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