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
150
Git and GitHub Platform Review
matthewmccullough
1
410
Your First Pull Request
matthewmccullough
0
270
Git and GitHub Workflows at the Utah JUG
matthewmccullough
1
790
Agile-ish life at GitHub
matthewmccullough
2
350
Git and GitHub Agile Workflows for HP
matthewmccullough
0
280
Writing Tools on the GitHub Platform
matthewmccullough
0
240
The Foundations of Collaboration with GitHub • SIGCSE 2014
matthewmccullough
1
100

Other Decks in Programming

See All in Programming
PHPで学ぶプログラミングの教訓 / Lessons in Programming Learned through PHP
nrslib
4
1.1k
traP の部内 ISUCON とそれを支えるポータル / PISCON Portal
ikura_hamu
0
180
ErdMap: Thinking about a map for Rails applications
makicamel
1
660
BEエンジニアがFEの業務をできるようになるまでにやったこと
yoshida_ryushin
0
200
Оптимизируем производительность блока Казначейство
lamodatech
0
960
Lookerは可視化だけじゃない。UIコンポーネントもあるんだ！
ymd65536
1
130
AWS re:Invent 2024個人的まとめ
satoshi256kbyte
0
100
PHPで作るWebSocketサーバー ~リアクティブなアプリケーションを知るために~ / WebSocket Server in PHP - To know reactive applications
seike460
PRO
2
770
PHPUnitしか使ってこなかった 一般PHPerがPestに乗り換えた実録
mashirou1234
0
420
React 19でお手軽にCSS-in-JSを自作する
yukukotani
5
570
rails newと同時に型を書く
aki19035vc
5
710
ChatGPT とつくる PHP で OS 実装
memory1994
PRO
3
190

Featured

See All Featured
Into the Great Unknown - MozCon
thekraken
34
1.6k
Music & Morning Musume
bryan
46
6.3k
Let's Do A Bunch of Simple Stuff to Make Websites Faster
chriscoyier
507
140k
The MySQL Ecosystem @ GitHub 2015
samlambert
250
12k
The Language of Interfaces
destraynor
155
24k
実際に使うSQLの書き方 徹底解説 / pgcon21j-tutorial
soudai
173
51k
The Success of Rails: Ensuring Growth for the Next 100 Years
eileencodes
44
7k
Performance Is Good for Brains [We Love Speed 2024]
tammyeverts
7
570
Designing for humans not robots
tammielis
250
25k
What's in a price? How to price your products and services
michaelherold
244
12k
GitHub's CSS Performance
jonrohan
1030
460k
The Cult of Friendly URLs
andyhume
78
6.1k

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