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
510
Your First Pull Request
Avatar for Matthew McCullough matthewmccullough
0
300
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
310
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
生成AI、実際どう？ - ニーリーの場合
Avatar for Nealle nealle
0
110
画像コンペでのベースラインモデルの育て方
Avatar for tattaka tattaka
3
1.7k
Nuances on Kubernetes - RubyConf Taiwan 2025
Avatar for Andrey Novikov envek
0
170
Amazon Q CLI開発で学んだAIコーディングツールの使い方
Avatar for matsukada licux
3
180
変化を楽しむエンジニアリング ~ いままでとこれから ~
Avatar for murajun1978 murajun1978
0
730
ワープロって実は計算機で
Avatar for Chiharu Shirasaka pepepper
2
1.4k
JetBrainsのAI機能の紹介 #jjug
Avatar for yusuke yusuke
0
200
Introduction to Git & GitHub
Avatar for Latte72 latte72
0
110
新しいモバイルアプリ勉強会（仮）について
Avatar for 上ちょ / uetyo uetyo
1
260
tool ディレクティブを導入してみた感想
Avatar for Sugar Sato sgash708
1
140
物語を動かす行動"量" #エンジニアニメ
Avatar for konifar konifar
14
5.2k
書き捨てではなく継続開発可能なコードをAIコーディングエージェントで書くために意識していること
Avatar for ShuyaKinjo shuyakinjo
1
280

Featured

See All Featured
The Myth of the Modular Monolith - Day 2 Keynote - Rails World 2024
Avatar for Eileen M. Uchitelle eileencodes
26
3k
Designing for humans not robots
Avatar for Tammie Lister tammielis
253
25k
Stop Working from a Prison Cell
Avatar for Chris Michel hatefulcrawdad
271
21k
BBQ
Avatar for Matthew Crist matthewcrist
89
9.8k
Visualization
Avatar for Eitan Lees eitanlees
146
16k
GraphQLとの向き合い方2022年版
Avatar for Yosuke Kurami quramy
49
14k
The MySQL Ecosystem @ GitHub 2015
Avatar for Sam Lambert samlambert
251
13k
The Pragmatic Product Professional
Avatar for Laura Van Doore lauravandoore
36
6.8k
Learning to Love Humans: Emotional Interface Design
Avatar for Aarron Walter aarron
273
40k
Embracing the Ebb and Flow
Avatar for Simon Collison colly
86
4.8k
The Art of Delivering Value - GDevCon NA Keynote
Avatar for David Neal reverentgeek
15
1.6k
Statistics for Hackers
Avatar for Jake VanderPlas jakevdp
799
220k

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