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
400
Your First Pull Request
matthewmccullough
0
270
Git and GitHub Workflows at the Utah JUG
matthewmccullough
1
770
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
PLoP 2024: The evolution of the microservice architecture pattern language
cer
PRO
0
1.6k
EventSourcingの理想と現実
wenas
6
2.1k
カラム追加で増えるActiveRecordのメモリサイズ イメージできますか?
asayamakk
4
1.5k
プロジェクト新規参入者のリードタイム短縮の観点から見る、品質の高いコードとアーキテクチャを保つメリット
d_endo
1
1k
約9000個の自動テストの 時間を50分->10分に短縮 Flakyテストを1%以下に抑えた話
hatsu38
23
11k
cXML という電子商取引の トランザクションを支える プロトコルと向きあっている話
phigasui
3
2.3k
ECSのサービス間通信 4つの方法を比較する 〜Canary,Blue/Greenも添えて〜
tkikuc
11
2.3k
Vue3の一歩踏み込んだパフォーマンスチューニング2024
hal_spidernight
3
3.1k
讓數據說話：用 Python、Prometheus 和 Grafana 講故事
eddie
0
350
Android 15 でアクションバー表示時にステータスバーが白くなってしまう問題
tonionagauzzi
0
140
GitHub Actionsのキャッシュと手を挙げることの大切さとそれに必要なこと
satoshi256kbyte
5
390
Kubernetes for Data Engineers: Building Scalable, Reliable Data Pipelines
sucitw
1
200

Featured

See All Featured
Keith and Marios Guide to Fast Websites
keithpitt
408
22k
RailsConf & Balkan Ruby 2019: The Past, Present, and Future of Rails at GitHub
eileencodes
131
33k
YesSQL, Process and Tooling at Scale
rocio
167
14k
Making Projects Easy
brettharned
115
5.9k
Code Reviewing Like a Champion
maltzj
519
39k
A Philosophy of Restraint
colly
203
16k
CoffeeScript is Beautiful & I Never Want to Write Plain JavaScript Again
sstephenson
159
15k
The MySQL Ecosystem @ GitHub 2015
samlambert
250
12k
Building an army of robots
kneath
302
42k
The Invisible Side of Design
smashingmag
297
50k
I Don’t Have Time: Getting Over the Fear to Launch Your Podcast
jcasabona
27
1.9k
It's Worth the Effort
3n
183
27k

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