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
440
Your First Pull Request
matthewmccullough
0
280
Git and GitHub Workflows at the Utah JUG
matthewmccullough
1
790
Agile-ish life at GitHub
matthewmccullough
2
360
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
100

Other Decks in Programming

See All in Programming
富山発の個人開発サービスで日本中の学校の業務を改善した話
krpk1900
5
390
密集、ドキュメントのコロケーション with AWS Lambda
satoshi256kbyte
0
190
Linux && Docker 研修/Linux && Docker training
forrep
24
4.5k
個人アプリを2年ぶりにアプデしたから褒めて / I just updated my personal app, praise me!
lovee
0
350
動作確認やテストで漏れがちな観点3選
starfish719
6
1k
Rubyで始める関数型ドメインモデリング
shogo_tksk
0
120
Boost Performance and Developer Productivity with Jakarta EE 11
ivargrimstad
0
340
『GO』アプリ バックエンドサーバのコスト削減
mot_techtalk
0
150
dbt Pythonモデルで実現するSnowflake活用術
trsnium
0
170
定理証明プラットフォーム lapisla.net
abap34
1
1.8k
Spring gRPC について / About Spring gRPC
mackey0225
0
220
CI改善もDatadogとともに
taumu
0
120

Featured

See All Featured
Facilitating Awesome Meetings
lara
52
6.2k
A better future with KSS
kneath
238
17k
How to Think Like a Performance Engineer
csswizardry
22
1.3k
[RailsConf 2023] Rails as a piece of cake
palkan
53
5.2k
Scaling GitHub
holman
459
140k
RailsConf 2023
tenderlove
29
1k
Cheating the UX When There Is Nothing More to Optimize - PixelPioneers
stephaniewalter
280
13k
Unsuck your backbone
ammeep
669
57k
How to Ace a Technical Interview
jacobian
276
23k
Fantastic passwords and where to find them - at NoRuKo
philnash
51
3k
GraphQLとの向き合い方2022年版
quramy
44
13k
A Modern Web Designer's Workflow
chriscoyier
693
190k

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