Upgrade to Pro — share decks privately, control downloads, hide ads and more …

Git Feature Branches as an Art

Sponsored · Your Podcast. Everywhere. Effortlessly. Share. Educate. Inspire. Entertain. You do you. We'll handle the rest. →
Avatar for Matthew McCullough Matthew McCullough
March 12, 2014
Programming
0
200

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
410
Collaborative Software Development in a Social World at the Utah JUG
Avatar for Matthew McCullough matthewmccullough
2
180
Git and GitHub Platform Review
Avatar for Matthew McCullough matthewmccullough
1
550
Your First Pull Request
Avatar for Matthew McCullough matthewmccullough
0
340
Git and GitHub Workflows at the Utah JUG
Avatar for Matthew McCullough matthewmccullough
1
850
Agile-ish life at GitHub
Avatar for Matthew McCullough matthewmccullough
2
410
Git and GitHub Agile Workflows for HP
Avatar for Matthew McCullough matthewmccullough
0
340
Writing Tools on the GitHub Platform
Avatar for Matthew McCullough matthewmccullough
0
290
The Foundations of Collaboration with GitHub • SIGCSE 2014
Avatar for Matthew McCullough matthewmccullough
1
130

Other Decks in Programming

See All in Programming
MUSUBIXとは
Avatar for Hisaho nahisaho
0
140
Best-Practices-for-Cortex-Analyst-and-AI-Agent
Avatar for ryotaro.ikeda@finatext.com ryotaroikeda
1
110
組織で育むオブザーバビリティ
Avatar for ryotaro kobayashi ryota_hnk
0
180
今こそ知るべき耐量子計算機暗号(PQC)入門 / PQC: What You Need to Know Now
Avatar for mackey0225 mackey0225
3
380
AI Agent の開発と運用を支える Durable Execution #AgentsInProd
Avatar for izumin5210 izumin5210
7
2.3k
Automatic Grammar Agreementと Markdown Extended Attributes
について
Avatar for Kishikawa Katsumi kishikawakatsumi
0
200
Raku Raku Notion 20260128
Avatar for hareyaka hareyakayuruyaka
0
360
MDN Web Docs に日本語翻訳でコントリビュート
Avatar for uutan1108 ohmori_yusuke
0
660
なぜSQLはAIぽく見えるのか/why does SQL look AI like
Avatar for florets1 florets1
0
480
16年目のピクシブ百科事典を支える最新の技術基盤 / The Modern Tech Stack Powering Pixiv Encyclopedia in its 16th Year
Avatar for ahu ahuglajbclajep
5
1k
dchart: charts from deck markup
Avatar for Anthony Starks ajstarks
3
1k
なるべく楽してバックエンドに型をつけたい！(楽とは言ってない)
Avatar for HIBIKI CUBE hibiki_cube
0
140

Featured

See All Featured
Exploring anti-patterns in Rails
Avatar for Elle Meredith aemeredith
2
250
First, design no harm
Avatar for Per Axbom axbom
PRO
2
1.1k
A Modern Web Designer's Workflow
Avatar for Chris Coyier chriscoyier
698
190k
The AI Search Optimization Roadmap by Aleyda Solis
Avatar for Aleyda Solis aleyda
1
5.2k
How to build an LLM SEO readiness audit: a practical framework
Avatar for Nick Samuel nmsamuel
1
650
Code Reviewing Like a Champion
Avatar for maltzj maltzj
527
40k
Scaling GitHub
Avatar for Zach Holman holman
464
140k
Exploring the Power of Turbo Streams & Action Cable | RailsConf2023
Avatar for Kevin Liebholz kevinliebholz
37
6.3k
What the history of the web can teach us about the future of AI
Avatar for Ines Montani inesmontani
PRO
1
440
Improving Core Web Vitals using Speculation Rules API
Avatar for Sergey Chernyshev sergeychernyshev
21
1.4k
Optimizing for Happiness
Avatar for Tom Preston-Werner mojombo
379
71k
Faster Mobile Websites
Avatar for Dean Hume deanohume
310
31k

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