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
250
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
alien-signals と自作 OSS で実現する フレームワーク非依存な ロジック共通化の探求 / Exploring Framework-Agnostic Logic Sharing with alien-signals and Custom OSS
aoseyuu
2
230
iOSでSVG画像を扱う
kishikawakatsumi
0
160
CSC305 Lecture 10
javiergs
PRO
0
220
What Spring Developers Should Know About Jakarta EE
ivargrimstad
0
430
エンジニアインターン「Treasure」とHonoの2年、そして未来へ / Our Journey with Hono Two Years at Treasure and Beyond
carta_engineering
0
410
タスクの特性や不確実性に応じた最適な作業スタイルの選択(ペアプロ・モブプロ・ソロプロ)と実践 / Optimal Work Style Selection: Pair, Mob, or Solo Programming.
honyanya
3
190
SODA - FACT BOOK(JP)
sodainc
1
8.6k
AkarengaLT vol.38
hashimoto_kei
1
120
3年ぶりにコードを書いた元CTOが Claude Codeと30分でMVPを作った話
maikokojima
0
620
コードとあなたと私の距離 / The Distance Between Code, You, and I
hiro_y
0
190
The Past, Present, and Future of Enterprise Java
ivargrimstad
0
190
Devoxx BE - Local Development in the AI Era
kdubois
0
140
Featured
See All Featured
Scaling GitHub
holman
463
140k
Dealing with People You Can't Stand - Big Design 2015
cassininazir
367
27k
The Cult of Friendly URLs
andyhume
79
6.6k
The MySQL Ecosystem @ GitHub 2015
samlambert
251
13k
Optimizing for Happiness
mojombo
379
70k
Stop Working from a Prison Cell
hatefulcrawdad
271
21k
Improving Core Web Vitals using Speculation Rules API
sergeychernyshev
21
1.2k
How to train your dragon (web standard)
notwaldorf
97
6.3k
GitHub's CSS Performance
jonrohan
1032
470k
[Rails World 2023 - Day 1 Closing Keynote] - The Magic of Rails
eileencodes
37
2.6k
The Pragmatic Product Professional
lauravandoore
36
7k
Why Our Code Smells
bkeepers
PRO
340
57k
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