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
120
0
Share
Embed
Copy iframe code
Copy JS code
Copy link
Start on current slide
I love sushi, therefore I love rebase
Give sushi and rebase a second chance!
Alex Tercete
November 29, 2016
More Decks by Alex Tercete
See All by Alex Tercete
Making Makefiles
alextercete
0
110
Shipping containers
alextercete
0
84
Parallelism and Symmetry
alextercete
0
260
Porting to .NET Standard
alextercete
0
84
Prepping Commits
alextercete
1
160
The end of your line-endings nightmare
alextercete
0
220
ReadyRoll for DotNet developers
alextercete
0
110
Coding Dojo: The Randori Kata
alextercete
1
590
How to be a good pair [programmer]
alextercete
0
160
Other Decks in Programming
See All in Programming
TSX の <Hoge<Fuga>> という構文に驚いた話 / tsx-type-argument-syntax
kanaru0928
0
240
そこに3びきプロダクトがいるじゃろう——生成AI時代における“価値が届かない理由”の構造
kosuket
0
540
Discordを用いたラボオートメーション関連情報収集の自動化
noguhiro2002
0
170
komatsuna「分散システムにおけるバグ分析手法」
komatsunaqa
0
270
仕様駆動開発へのトライを機に チームに適合する手法を模索し続けている話
freee
PRO
0
580
freee が目指す データ マネジメント戦略 AI-Ready 時代を支える 攻めのガバナンスとは
freee
PRO
0
440
SlackアプリとLambdaの 連携を構築した話
pawn_4_s
1
130
S3 を使うアプリケーションをローカル完結で動かすことに全力を注いでみた / Running S3 Apps Offline
contour_gara
0
560
改善しないと、タスクが回らない。 “てんこ盛りポジション” を引き継いだ情シスの、入社3ヶ月の業務改善録
krm963
0
280
楽しそうなつよつよエンジニアと目が死んでる僕/A brilliant engineer having a blast, and dead-eyed me.
3l4l5
2
200
「つくるAI」だけではバグは見つからない ~テストに必要な「見つけるAI」を分離させる戦略~
mfunaki
0
120
言葉の格闘技のススメ~紙とペンと言葉から始める、キャリアの描き方~
progresscicada
2
170
Featured
See All Featured
Digital Projects Gone Horribly Wrong (And the UX Pros Who Still Save the Day) - Dean Schuster
uxyall
1
2.4k
sira's awesome portfolio website redesign presentation
elsirapls
0
330
Unlocking the hidden potential of vector embeddings in international SEO
frankvandijk
0
900
SEO Brein meetup: CTRL+C is not how to scale international SEO
lindahogenes
1
2.8k
Winning Ecommerce Organic Search in an AI Era - #searchnstuff2025
aleyda
1
2.1k
Dealing with People You Can't Stand - Big Design 2015
cassininazir
367
27k
Put a Button on it: Removing Barriers to Going Fast.
kastner
60
4.5k
The Power of CSS Pseudo Elements
geoffreycrofte
82
6.5k
A Guide to Academic Writing Using Generative AI - A Workshop
ks91
PRO
1
380
B2B Lead Gen: Tactics, Traps & Triumph
marketingsoph
0
220
What’s in a name? Adding method to the madness
productmarketing
PRO
24
4.1k
The Illustrated Children's Guide to Kubernetes
chrisshort
51
53k
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