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
160

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
380
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
490
Your First Pull Request
Avatar for Matthew McCullough matthewmccullough
0
290
Git and GitHub Workflows at the Utah JUG
Avatar for Matthew McCullough matthewmccullough
1
820
Agile-ish life at GitHub
Avatar for Matthew McCullough matthewmccullough
2
380
Git and GitHub Agile Workflows for HP
Avatar for Matthew McCullough matthewmccullough
0
300
Writing Tools on the GitHub Platform
Avatar for Matthew McCullough matthewmccullough
0
260
The Foundations of Collaboration with GitHub • SIGCSE 2014
Avatar for Matthew McCullough matthewmccullough
1
110

Other Decks in Programming

See All in Programming
データベースコネクションプール(DBCP)の変遷と理解
Avatar for k.fujikawa8 fujikawa8
1
220
プロダクト開発でも使おう 関数のオーバーロード
Avatar for yoiwamoto yoiwamoto
0
140
コードに語らせよう――自己ドキュメント化が内包する楽しさについて / Let the Code Speak
Avatar for nrs nrslib
6
1.4k
ワンバイナリWebサービスのススメ
Avatar for mackee mackee
10
7.7k
「兵法」から見る質とスピード
Avatar for ICKX ickx
0
250
生成AIで日々のエラー調査を進めたい
Avatar for aboy yuyaabo
0
460
PT AI без купюр
Avatar for Vladimir Kochetkov v0lka
0
220
Enterprise Web App. Development (2): Version Control Tool Training Ver. 5.1
Avatar for Koichi NAKAGAWA knakagawa
1
110
ReadMoreTextView
Avatar for Sungyong An fornewid
0
230
Blueskyのプラグインを作ってみた
Avatar for Hakkadaikon hakkadaikon
1
460
List Unfolding - 'unfold' as the Computational Dual of 'fold', and how 'unfold' relates to 'iterate'"
Avatar for Philip Schwarz philipschwarz
PRO
0
180
eBPFを用いたAIネットワーク監視システム論文の実装 / eBPF Japan Meetup #4
Avatar for Yuuki Tsubouchi (yuuk1) yuukit
3
730

Featured

See All Featured
RailsConf 2023
Avatar for Aaron Patterson tenderlove
30
1.1k
The MySQL Ecosystem @ GitHub 2015
Avatar for Sam Lambert samlambert
251
13k
Being A Developer After 40
Avatar for Adrian Kosmaczewski akosma
90
590k
Documentation Writing (for coders)
Avatar for Carmen Chung carmenintech
71
4.9k
Visualizing Your Data: Incorporating Mongo into Loggly Infrastructure
Avatar for mongodb mongodb
46
9.6k
Intergalactic Javascript Robots from Outer Space
Avatar for Vicent Martí tanoku
271
27k
Building Applications with DynamoDB
Avatar for Matt Wood mza
95
6.4k
"I'm Feeling Lucky" - Building Great Search Experiences for Today's Users (#IAC19)
Avatar for Dan Newman danielanewman
228
22k
Building Better People: How to give real-time feedback that sticks.
Avatar for Will Jessup wjessup
367
19k
Balancing Empowerment & Direction
Avatar for Lara Hogan lara
1
210
The Invisible Side of Design
Avatar for Vitaly Friedman smashingmag
299
50k
We Have a Design System, Now What?
Avatar for Morgane Peng morganepeng
52
7.6k

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