Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Features
Speaker Deck
PRO
Sign in
Sign up for free
Search
Search
I love sushi, therefore I love rebase
Search
Alex Tercete
November 29, 2016
Programming
0
110
I love sushi, therefore I love rebase
Give sushi and rebase a second chance!
Alex Tercete
November 29, 2016
Tweet
Share
More Decks by Alex Tercete
See All by Alex Tercete
Making Makefiles
alextercete
0
83
Shipping containers
alextercete
0
69
Parallelism and Symmetry
alextercete
0
240
Porting to .NET Standard
alextercete
0
70
Prepping Commits
alextercete
1
140
The end of your line-endings nightmare
alextercete
0
200
ReadyRoll for DotNet developers
alextercete
0
96
Coding Dojo: The Randori Kata
alextercete
1
560
How to be a good pair [programmer]
alextercete
0
130
Other Decks in Programming
See All in Programming
After go func(): Goroutines Through a Beginner’s Eye
97vaibhav
0
200
なぜあの開発者はDevRelに伴走し続けるのか / Why Does That Developer Keep Running Alongside DevRel?
nrslib
1
310
CSC509 Lecture 02
javiergs
PRO
0
400
CSC305 Lecture 02
javiergs
PRO
1
260
Web フロントエンドエンジニアに開かれる AI Agent プロダクト開発 - Vercel AI SDK を観察して AI Agent と仲良くなろう! #FEC余熱NIGHT
izumin5210
2
300
CSC305 Lecture 01
javiergs
PRO
1
380
CSC509 Lecture 03
javiergs
PRO
0
320
実践AIチャットボットUI実装入門
syumai
7
2.4k
非同期jobをtransaction内で 呼ぶなよ!絶対に呼ぶなよ!
alstrocrack
0
370
iOSDC.pdf
chronos2500
2
650
Conquering Massive Traffic Spikes in Ruby Applications with Pitchfork
riseshia
0
140
SpecKitでどこまでできる? コストはどれくらい?
leveragestech
0
410
Featured
See All Featured
BBQ
matthewcrist
89
9.8k
Visualizing Your Data: Incorporating Mongo into Loggly Infrastructure
mongodb
48
9.7k
Keith and Marios Guide to Fast Websites
keithpitt
411
22k
Learning to Love Humans: Emotional Interface Design
aarron
274
40k
10 Git Anti Patterns You Should be Aware of
lemiorhan
PRO
657
61k
Dealing with People You Can't Stand - Big Design 2015
cassininazir
367
27k
Why You Should Never Use an ORM
jnunemaker
PRO
59
9.5k
Testing 201, or: Great Expectations
jmmastey
45
7.7k
It's Worth the Effort
3n
187
28k
How to Ace a Technical Interview
jacobian
280
23k
Music & Morning Musume
bryan
46
6.8k
The Art of Delivering Value - GDevCon NA Keynote
reverentgeek
15
1.7k
Transcript
Alex Tercete @alextercete I ❤ SUSHI therefore I ❤ REBASE
None
Nourishment & Delight
Nourishment & Delight food
Nourishment & Delight food changes
Nourishment & Delight food changes Survival Satisfaction
Nourishment & Delight food changes Survival Satisfaction
Who here likes sushi?
+
None
None
None
you
you remote
you teammate remote
you teammate remote
$ git push --force-with-lease
you teammate remote
you teammate remote
you teammate remote
you teammate remote
$ git fetch $ git reset --hard … $ git
cherry-pick …
I ❤ SUSHI therefore I ❤ REBASE
None
Release version 1.2.3 Merge pull request #45 from ... Introduce
parser abstraction Extract name parsing logic Remove trailing whitespace README: Add setup instructions Add .editorconfig
$ git add --interactive
None
None
None
None
None
$ git rebase --interactive
None
None
None
None
None
None
None
$ git add --patch $ git diff --check
None
None
None
Alex Tercete @alextercete Thanks!
Credits ePi.Longo flickr.com/photos/longo/2176603327 Mathieu Schoutteten flickr.com/photos/mathieu_schoutteten/6776577405 Yoel Ben-Avraham flickr.com/photos/epublicist/15552378181 Shaun
Fisher flickr.com/photos/87007001@N04/14643379354 James Bowe flickr.com/photos/jamesrbowe/4231509266 slimmer_jimmer flickr.com/photos/slimjim/2338297312 Yuri Samoilov flickr.com/photos/yuri_samoilov/10590523726 Michael Saechang flickr.com/photos/saechang/15588474204