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
170

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
390
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
390
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
270
The Foundations of Collaboration with GitHub • SIGCSE 2014
Avatar for Matthew McCullough matthewmccullough
1
120

Other Decks in Programming

See All in Programming
Azure AI Foundryではじめてのマルチエージェントワークフロー
Avatar for 瀬尾佳隆 seosoft
0
200
システム成長を止めない！本番無停止テーブル移行の全貌
Avatar for さかうぇ sakawe_ee
1
360
チームで開発し事業を加速するための"良い"設計の考え方 @ サポーターズCoLab 2025-07-08
Avatar for Agata Naomichi agatan
1
470
イベントストーミング図からコードへの変換手順 / Procedure for Converting Event Storming Diagrams to Code
Avatar for nrs nrslib
2
1.1k
『自分のデータだけ見せたい！』を叶える──Laravel × Casbin で複雑権限をスッキリ解きほぐす 25 分
Avatar for AkitoTsukahara akitotsukahara
2
660
「テストは愚直&&網羅的に書くほどよい」という誤解 / Test Smarter, Not Harder
Avatar for Munetoshi Ishikawa munetoshi
0
200
レベル1の開発生産性向上に取り組む − 日々の作業の効率化・自動化を通じた改善活動
Avatar for kesoji kesoji
0
300
MCPを使ってイベントソーシングのAIコーディングを効率化する / Streamlining Event Sourcing AI Coding with MCP
Avatar for Tomohisa Takaoka tomohisa
0
170
テスト駆動Kaggle
Avatar for ねぼすけAI isax1015
1
620
なぜ「共通化」を考え、失敗を繰り返すのか
Avatar for Rinchoku rinchoku
1
680
Model Pollution
Avatar for Henning Schwentner hschwentner
1
160
たった 1 枚の PHP ファイルで実装する MCP サーバ / MCP Server with Vanilla PHP
Avatar for Shohei Okada okashoi
1
300

Featured

See All Featured
個人開発の失敗を避けるイケてる考え方 / tips for indie hackers
Avatar for panda_program panda_program
108
19k
Agile that works and the tools we love
Avatar for Rasmus Luckow-Nielsen rasmusluckow
329
21k
Optimising Largest Contentful Paint
Avatar for Harry Roberts csswizardry
37
3.3k
Large-scale JavaScript Application Architecture
Avatar for Addy Osmani addyosmani
512
110k
Why Our Code Smells
Avatar for Brandon Keepers bkeepers
PRO
337
57k
Visualization
Avatar for Eitan Lees eitanlees
146
16k
Designing for Performance
Avatar for Lara Hogan lara
610
69k
Visualizing Your Data: Incorporating Mongo into Loggly Infrastructure
Avatar for mongodb mongodb
47
9.6k
Helping Users Find Their Own Way: Creating Modern Search Experiences
Avatar for Dan Newman danielanewman
29
2.7k
Building a Modern Day 
E-commerce SEO Strategy
Avatar for Aleyda Solis aleyda
42
7.4k
Rebuilding a faster, lazier Slack
Avatar for samanthasiow samanthasiow
83
9.1k
Keith and Marios Guide to Fast Websites
Avatar for Keith Pitt keithpitt
411
22k

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