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

Git Feature Branches as an Art

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.

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
matthewmccullough
1
340
Collaborative Software Development in a Social World at the Utah JUG
matthewmccullough
2
130
Git and GitHub Platform Review
matthewmccullough
1
280
Your First Pull Request
matthewmccullough
0
220
Git and GitHub Workflows at the Utah JUG
matthewmccullough
1
650
Agile-ish life at GitHub
matthewmccullough
2
270
Git and GitHub Agile Workflows for HP
matthewmccullough
0
230
Writing Tools on the GitHub Platform
matthewmccullough
0
210
The Foundations of Collaboration with GitHub • SIGCSE 2014
matthewmccullough
1
94

Other Decks in Programming

See All in Programming
Compose で手に入れた UI の Unit test
mkeeda
2
360
10Xにおけるdbtの事例紹介
10xinc
0
970
NIFTY Tech Talk #09 ニフティトップのNext.jsでのキャッシュ戦略を考えた話
niftycorp
0
110
Learning PHP with PHP Parser
inouehi
1
190
Coroutines Test 入門 / Android Test Night #8
star_zero
2
280
推測するな、計測せよ New Relic × Laravel 実践
mpyw
2
220
Honoの3+1のルーターとそこにつながるPRがプロジェクトにもたらしたもの
usualoma
1
830
Rendez-vous service et optimisez votre environnement de développement
bastnic
1
420
新しいことに挑戦したい組織が考えるべきこと
headwaters
0
150
macのunicode正規化.pdf
mski_iksm
0
9.9k
NOT A HOTEL
AIコンシェルジュ「Kevin」の開発秘話
codehex
2
2.5k
GitHub ActionsとDeployGateで始めるAndroidアプリのCICD
yuhei_fujita
2
180

Featured

See All Featured
What's in a price? How to price your products and services
michaelherold
233
9.8k
jQuery: Nuts, Bolts and Bling
dougneiner
57
6.7k
Fontdeck: Realign not Redesign
paulrobertlloyd
74
4.4k
CoffeeScript is Beautiful & I Never Want to Write Plain JavaScript Again
sstephenson
152
13k
Music & Morning Musume
bryan
37
4.7k
Fantastic passwords and where to find them - at NoRuKo
philnash
32
1.9k
Fight the Zombie Pattern Library - RWD Summit 2016
marcelosomers
227
16k
Fashionably flexible responsive web design (full day workshop)
malarkey
396
64k
Distributed Sagas: A Protocol for Coordinating Microservices
caitiem20
318
19k
Building an army of robots
kneath
300
41k
Why Our Code Smells
bkeepers
PRO
326
55k
Art Directing for the Web. Five minutes with CSS Template Areas
malarkey
197
11k

Transcript

  1. Feature Branches

    as an art
    with
    Matthew McCullough
    at Fluent 2014

    View Slide

  2. [email protected]
    education.github.com
    @matthewmccull
    Q&A

    View Slide

  3. Branch everything

    View Slide

  4. Reuse commit messages

    View Slide

  5. Combine with amend

    View Slide

  6. Redo with reset

    View Slide

  7. Squash a merge

    View Slide

  8. Reuse with cherry pick

    View Slide

  9. Rebase on a branch

    View Slide

  10. Rebase interactively

    View Slide

  11. Fixup with rebase

    View Slide

  12. Branch duplication

    View Slide

  13. Reflog for resurrection

    View Slide