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
160

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
380
Collaborative Software Development in a Social World at the Utah JUG
matthewmccullough
2
160
Git and GitHub Platform Review
matthewmccullough
1
460
Your First Pull Request
matthewmccullough
0
280
Git and GitHub Workflows at the Utah JUG
matthewmccullough
1
810
Agile-ish life at GitHub
matthewmccullough
2
370
Git and GitHub Agile Workflows for HP
matthewmccullough
0
290
Writing Tools on the GitHub Platform
matthewmccullough
0
250
The Foundations of Collaboration with GitHub • SIGCSE 2014
matthewmccullough
1
110

Other Decks in Programming

See All in Programming
ニックトレイン登壇資料
ryotakurokawa
0
140
コンテナでLambdaをデプロイするときに知っておきたかったこと
_takahash
0
150
php-fpm がリクエスト処理する仕組みを追う / Tracing-How-php-fpm-Handles-Requests
shin1x1
5
820
自分のために作ったアプリが、グローバルに使われるまで / Indie App Development Lunch LT
pixyzehn
1
120
RailsでCQRS/ESをやってみたきづき
suzukimar
2
1.5k
私の愛したLaravel 〜レールを超えたその先へ〜
kentaroutakeda
12
3.5k
英語文法から学ぶ、クリーンな設計の秘訣
newnomad
1
270
AI Agentを利用したAndroid開発について
yuchan2215
0
210
生産性アップのためのAI個人活用
kunoyasu
0
640
remix + cloudflare workers (DO) docker上でいい感じに開発する
yoshidatomoaki
0
120
PHPでお金を扱う時、終わりのない 謎の1円調査の旅にでなくて済む方法
nakka
3
1.2k
20250326_生成AIによる_レビュー承認システムの実現.pdf
takahiromatsui
17
5.5k

Featured

See All Featured
The MySQL Ecosystem @ GitHub 2015
samlambert
251
12k
Easily Structure & Communicate Ideas using Wireframe
afnizarnur
194
16k
Helping Users Find Their Own Way: Creating Modern Search Experiences
danielanewman
29
2.5k
ReactJS: Keep Simple. Everything can be a component!
pedronauck
666
120k
Making the Leap to Tech Lead
cromwellryan
133
9.2k
Navigating Team Friction
lara
184
15k
Optimizing for Happiness
mojombo
377
70k
RailsConf 2023
tenderlove
29
1k
Reflections from 52 weeks, 52 projects
jeffersonlam
349
20k
Why Our Code Smells
bkeepers
PRO
336
57k
Raft: Consensus for Rubyists
vanstee
137
6.8k
Measuring & Analyzing Core Web Vitals
bluesmoon
6
320

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