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
140

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
360
Collaborative Software Development in a Social World at the Utah JUG
matthewmccullough
2
140
Git and GitHub Platform Review
matthewmccullough
1
320
Your First Pull Request
matthewmccullough
0
260
Git and GitHub Workflows at the Utah JUG
matthewmccullough
1
720
Agile-ish life at GitHub
matthewmccullough
2
310
Git and GitHub Agile Workflows for HP
matthewmccullough
0
250
Writing Tools on the GitHub Platform
matthewmccullough
0
220
The Foundations of Collaboration with GitHub • SIGCSE 2014
matthewmccullough
1
99

Other Decks in Programming

See All in Programming
try! Swift Tokyo 2024のLT枠に採択されたプロポーザルを出すときに考えていたこと
ski
0
350
Build Apps for iOS, Android & Desktop in 100% Kotlin With Compose Multiplatform (mDevCamp 2024)
zsmb
0
230
PHP8.3の機能を振り返る / Review of PHP 8.3 features
seike460
PRO
1
110
OpenAPIを中心に考えるAPI開発入門 / Introduction to API Development with a Focus on OpenAPI
seike460
PRO
2
160
データアナリストが行うDatabricksを活用したETLの自動化事例
shinoa
0
260
Ruby Pattern Matching
bkuhlmann
0
920
使ってみよう Azure AI Document Intelligence
kosmosebi
2
280
CQRS/ES avec Symfony, c’est (trop) bien !
jeremyfreeagent
1
640
Komplexe Oberflächen mit SVG und der Web Animation API
joergneumann
0
670
今、知っておきたい! 生成AIエージェントの世界
elith
3
350
Zero Waste, Radical Magic, and Italian Graft – Quarkus Efficiency Secrets
hollycummins
0
230
ゆるい個人開発のススメ
kuroppe1819
10
980

Featured

See All Featured
It's Worth the Effort
3n
180
27k
How to train your dragon (web standard)
notwaldorf
73
5.2k
Producing Creativity
orderedlist
PRO
337
39k
Keith and Marios Guide to Fast Websites
keithpitt
408
22k
Testing 201, or: Great Expectations
jmmastey
28
6.3k
Building Effective Engineering Teams - LeadDev
addyosmani
28
1.8k
CoffeeScript is Beautiful & I Never Want to Write Plain JavaScript Again
sstephenson
155
14k
The Invisible Side of Design
smashingmag
294
49k
Designing the Hi-DPI Web
ddemaree
276
33k
Visualizing Your Data: Incorporating Mongo into Loggly Infrastructure
mongodb
34
8.9k
Optimizing for Happiness
mojombo
370
69k
YesSQL, Process and Tooling at Scale
rocio
164
13k

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