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
140
Git and GitHub Platform Review
matthewmccullough
1
390
Your First Pull Request
matthewmccullough
0
270
Git and GitHub Workflows at the Utah JUG
matthewmccullough
1
760
Agile-ish life at GitHub
matthewmccullough
2
330
Git and GitHub Agile Workflows for HP
matthewmccullough
0
270
Writing Tools on the GitHub Platform
matthewmccullough
0
230
The Foundations of Collaboration with GitHub • SIGCSE 2014
matthewmccullough
1
100

Other Decks in Programming

See All in Programming
学生の時に開催したPerl入学式をきっかけにエンジニアが組織に馴染むために勉強会を主催や仲間と参加して職能間の境界を越えていく
ohmori_yusuke
1
130
CDKを活用した 大規模コンテナ移行 プロジェクトの紹介
yoyoyopg
0
310
A Journey of Contribution and Collaboration in Open Source
ivargrimstad
0
470
ECS向けのドリフト検知機構を実装してみた
tkikuc
0
290
dbt-ga4パッケージを実業務に導入してみた話
t_tokumaru_feedcorp
0
130
The Efficiency Paradox and How to Save Yourself and the World
hollycummins
0
170
Real-time message handling and notifications with API Platform and Symfony
alli83
1
110
Kotlin Multiplatform at Stable and Beyond (Kotlin Vienna, October 2024)
zsmb
2
350
デバッグの話 / Debugging for Beginners
kaityo256
PRO
6
460
Infrastructure as Code でセキュリティを楽にしよう！
konokenj
6
1.4k
Quarto Clean Theme
nicetak
0
220
メルカリ ハロ アプリの技術スタック
atsumo
2
790

Featured

See All Featured
Practical Orchestrator
shlominoach
186
10k
Done Done
chrislema
181
16k
The Brand Is Dead. Long Live the Brand.
mthomps
53
38k
Building Applications with DynamoDB
mza
90
6k
The Art of Delivering Value - GDevCon NA Keynote
reverentgeek
4
120
Raft: Consensus for Rubyists
vanstee
136
6.6k
4 Signs Your Business is Dying
shpigford
180
21k
Atom: Resistance is Futile
akmur
261
25k
Scaling GitHub
holman
458
140k
What’s in a name? Adding method to the madness
productmarketing
PRO
22
3.1k
Building Adaptive Systems
keathley
38
2.2k
From Idea to $5000 a Month in 5 Months
shpigford
381
46k

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