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
160

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
380
Collaborative Software Development in a Social World at the Utah JUG
matthewmccullough
2
160
Git and GitHub Platform Review
matthewmccullough
1
460
Your First Pull Request
matthewmccullough
0
280
Git and GitHub Workflows at the Utah JUG
matthewmccullough
1
810
Agile-ish life at GitHub
matthewmccullough
2
370
Git and GitHub Agile Workflows for HP
matthewmccullough
0
290
Writing Tools on the GitHub Platform
matthewmccullough
0
250
The Foundations of Collaboration with GitHub • SIGCSE 2014
matthewmccullough
1
110

Other Decks in Programming

See All in Programming
CRE Meetup！ユーザー信頼性を支えるエンジニアリング実践例の発表資料です
tmnb
0
630
AI Coding Agent Enablement - エージェントを自走させよう
yukukotani
13
5.8k
スモールスタートで始めるためのLambda×モノリス
akihisaikeda
2
180
custom_lintで始めるチームルール管理
akaboshinit
0
200
AIコードエディタの基盤となるLLMのFlutter性能評価
alquist4121
0
200
タイムゾーンの奥地は思ったよりも闇深いかもしれない
suguruooki
1
570
SQL Server ベクトル検索
odashinsuke
0
170
海外のアプリで見かけたかっこいいTransitionを真似てみる
shogotakasaki
1
160
ベクトル検索システムの気持ち
monochromegane
31
9.9k
DomainException と Result 型で作る型安全なエラーハンドリング
karszawa
0
890
Java 24まとめ / Java 24 summary
kishida
3
460
Building a macOS screen saver with Kotlin (Android Makers 2025)
zsmb
1
140

Featured

See All Featured
Refactoring Trust on Your Teams (GOTO; Chicago 2020)
rmw
34
2.9k
Writing Fast Ruby
sferik
628
61k
Done Done
chrislema
183
16k
The Myth of the Modular Monolith - Day 2 Keynote - Rails World 2024
eileencodes
23
2.6k
Fireside Chat
paigeccino
37
3.4k
It's Worth the Effort
3n
184
28k
Git: the NoSQL Database
bkeepers
PRO
430
65k
Chrome DevTools: State of the Union 2024 - Debugging React & Beyond
addyosmani
5
520
Building a Modern Day 
E-commerce SEO Strategy
aleyda
40
7.2k
VelocityConf: Rendering Performance Case Studies
addyosmani
328
24k
Gamification - CAS2011
davidbonilla
81
5.2k
Fight the Zombie Pattern Library - RWD Summit 2016
marcelosomers
233
17k

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