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
100
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
65
Shipping containers
alextercete
0
53
Parallelism and Symmetry
alextercete
0
210
Porting to .NET Standard
alextercete
0
55
Prepping Commits
alextercete
1
130
The end of your line-endings nightmare
alextercete
0
180
ReadyRoll for DotNet developers
alextercete
0
85
Coding Dojo: The Randori Kata
alextercete
1
500
How to be a good pair [programmer]
alextercete
0
130
Other Decks in Programming
See All in Programming
第3回関東Kaggler会_AtCoderはKaggleの役に立つ
chettub
3
1.2k
メンテが命: PHPフレームワークのコンテナ化とアップグレード戦略
shunta27
0
300
Jakarta EE meets AI
ivargrimstad
0
340
コードを読んで理解するko build
bells17
1
110
Honoをフロントエンドで使う 3つのやり方
yusukebe
7
3.5k
コミュニティ駆動 AWS CDK ライブラリ「Open Constructs Library」 / community-cdk-library
gotok365
2
240
新宿駅構内を三人称視点で探索してみる
satoshi7190
2
120
Multi Step Form, Decentralized Autonomous Organization
pumpkiinbell
1
860
Datadog Workflow Automation で圧倒的価値提供
showwin
1
160
負債になりにくいCSSをデザイナとつくるには?
fsubal
10
2.6k
Kotlinの開発でも AIをいい感じに使いたい / Making the Most of AI in Kotlin Development
kohii00
5
1.2k
Rubyと自由とAIと
yotii23
6
1.7k
Featured
See All Featured
We Have a Design System, Now What?
morganepeng
51
7.4k
The Psychology of Web Performance [Beyond Tellerrand 2023]
tammyeverts
46
2.3k
Templates, Plugins, & Blocks: Oh My! Creating the theme that thinks of everything
marktimemedia
30
2.2k
Mobile First: as difficult as doing things right
swwweet
223
9.4k
I Don’t Have Time: Getting Over the Fear to Launch Your Podcast
jcasabona
32
2.1k
A designer walks into a library…
pauljervisheath
205
24k
Evolution of real-time – Irina Nazarova, EuRuKo, 2024
irinanazarova
6
570
What's in a price? How to price your products and services
michaelherold
244
12k
Git: the NoSQL Database
bkeepers
PRO
427
65k
RailsConf & Balkan Ruby 2019: The Past, Present, and Future of Rails at GitHub
eileencodes
133
33k
Bootstrapping a Software Product
garrettdimon
PRO
306
110k
GitHub's CSS Performance
jonrohan
1030
460k
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