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
150

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
370
Collaborative Software Development in a Social World at the Utah JUG
matthewmccullough
2
150
Git and GitHub Platform Review
matthewmccullough
1
410
Your First Pull Request
matthewmccullough
0
270
Git and GitHub Workflows at the Utah JUG
matthewmccullough
1
790
Agile-ish life at GitHub
matthewmccullough
2
350
Git and GitHub Agile Workflows for HP
matthewmccullough
0
280
Writing Tools on the GitHub Platform
matthewmccullough
0
240
The Foundations of Collaboration with GitHub • SIGCSE 2014
matthewmccullough
1
100

Other Decks in Programming

See All in Programming
混沌とした例外処理とエラー監視に秩序をもたらす
morihirok
13
2.2k
為你自己學 Python
eddie
0
520
AppRouterを用いた大規模サービス開発におけるディレクトリ構成の変遷と問題点

eiganken
1
440
shadcn/uiを使ってReactでの開発を加速させよう！
lef237
0
300
CQRS+ES の力を使って効果を感じる / Feel the effects of using the power of CQRS+ES
seike460
PRO
0
240
DevFest - Serverless 101 with Google Cloud Functions
tunmise
0
140
サーバーゆる勉強会 DBMS の仕組み編
kj455
1
300
Fixstars高速化コンテスト2024準優勝解法
eijirou
0
190
Rubyでつくるパケットキャプチャツール
ydah
0
170
PHPカンファレンス 2024｜共創を加速するための若手の技術挑戦
weddingpark
0
140
Оптимизируем производительность блока Казначейство
lamodatech
0
950
Beyond ORM
77web
11
1.6k

Featured

See All Featured
Bootstrapping a Software Product
garrettdimon
PRO
305
110k
Building Your Own Lightsaber
phodgson
104
6.2k
Side Projects
sachag
452
42k
Gamification - CAS2011
davidbonilla
80
5.1k
Designing for Performance
lara
604
68k
Templates, Plugins, & Blocks: Oh My! Creating the theme that thinks of everything
marktimemedia
28
2.2k
ピンチをチャンスに：未来をつくるプロダクトロードマップ #pmconf2020
aki_iinuma
113
50k
Design and Strategy: How to Deal with People Who Don’t "Get" Design
morganepeng
127
18k
The Art of Programming - Codeland 2020
erikaheidi
53
13k
A Philosophy of Restraint
colly
203
16k
Thoughts on Productivity
jonyablonski
68
4.4k
Save Time (by Creating Custom Rails Generators)
garrettdimon
PRO
29
960

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