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

Git Feature Branches as an Art

Avatar for Matthew McCullough Matthew McCullough
March 12, 2014
Programming
0
180

Git Feature Branches as an Art

Slides from Matthew's Fluent (http://fluentconf.com/fluent2014) talk on Feature Branches in Git.

Avatar for Matthew McCullough

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
Avatar for Matthew McCullough matthewmccullough
1
390
Collaborative Software Development in a Social World at the Utah JUG
Avatar for Matthew McCullough matthewmccullough
2
170
Git and GitHub Platform Review
Avatar for Matthew McCullough matthewmccullough
1
520
Your First Pull Request
Avatar for Matthew McCullough matthewmccullough
0
300
Git and GitHub Workflows at the Utah JUG
Avatar for Matthew McCullough matthewmccullough
1
830
Agile-ish life at GitHub
Avatar for Matthew McCullough matthewmccullough
2
390
Git and GitHub Agile Workflows for HP
Avatar for Matthew McCullough matthewmccullough
0
310
Writing Tools on the GitHub Platform
Avatar for Matthew McCullough matthewmccullough
0
280
The Foundations of Collaboration with GitHub • SIGCSE 2014
Avatar for Matthew McCullough matthewmccullough
1
120

Other Decks in Programming

See All in Programming
WebエンジニアがSwiftをブラウザで動かすプレイグラウンドを作ってみた
Avatar for uutan1108 ohmori_yusuke
0
170
階層構造を表現するデータ構造とリファクタリング 〜1年で10倍成長したプロダクトの変化と課題〜
Avatar for yuhi yuhisatoxxx
3
900
CI_CD「健康診断」のススメ。現場でのボトルネック特定から、健康診断を通じた組織的な改善手法
Avatar for teamLab teamlab
PRO
0
170
アメ車でサンノゼを走ってきたよ！
Avatar for Shigure Shimotori s_shimotori
0
130
クラシルを支える技術と組織
Avatar for raku rakutek
0
190
overlayPreferenceValue で実現する ピュア SwiftUI な AdMob ネイティブ広告
Avatar for Takashi uhucream
0
100
iOSDC.pdf
Avatar for ビスター chronos2500
2
660
CSC305 Lecture 04
Avatar for Javier Gonzalez-Sanchez javiergs
PRO
0
250
『毎日の移動』を支えるGoバックエンド内製開発
Avatar for yutautsugi yutautsugi
2
160
ソフトウェア設計の実践的な考え方
Avatar for 増田 亨 masuda220
PRO
3
450
Playwrightはどのようにクロスブラウザをサポートしているのか
Avatar for nus3 yotahada3
7
2.3k
Let's Write a Train Tracking Algorithm
Avatar for Chris Trott twocentstudios
0
220

Featured

See All Featured
How to Think Like a Performance Engineer
Avatar for Harry Roberts csswizardry
27
2k
Java REST API Framework Comparison - PWX 2021
Avatar for Matt Raible mraible
33
8.8k
Producing Creativity
Avatar for Steve Smith orderedlist
PRO
347
40k
Why You Should Never Use an ORM
Avatar for John Nunemaker jnunemaker
PRO
59
9.6k
個人開発の失敗を避けるイケてる考え方 / tips for indie hackers
Avatar for panda_program panda_program
114
20k
BBQ
Avatar for Matthew Crist matthewcrist
89
9.8k
Keith and Marios Guide to Fast Websites
Avatar for Keith Pitt keithpitt
411
22k
Facilitating Awesome Meetings
Avatar for Lara Hogan lara
56
6.6k
Evolution of real-time – Irina Nazarova, EuRuKo, 2024
Avatar for Irina Nazarova irinanazarova
9
960
How GitHub (no longer) Works
Avatar for Zach Holman holman
315
140k
Product Roadmaps are Hard
Avatar for C. Todd Lombardo iamctodd
PRO
54
11k
StorybookのUI Testing Handbookを読んだ
Avatar for Shingo Yamazaki zakiyama
31
6.2k

Transcript

  1. Feature Branches
 as an art with Matthew McCullough at Fluent

    2014

  2. [email protected] 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