Upgrade to Pro — share decks privately, control downloads, hide ads and more …

I love sushi, therefore I love rebase

Sponsored · Your Podcast. Everywhere. Effortlessly. Share. Educate. Inspire. Entertain. You do you. We'll handle the rest. →
Avatar for Alex Tercete Alex Tercete
November 29, 2016
Programming
120
0

I love sushi, therefore I love rebase

Give sushi and rebase a second chance!

Avatar for Alex Tercete

Alex Tercete

November 29, 2016

More Decks by Alex Tercete

See All by Alex Tercete
Making Makefiles
Avatar for Alex Tercete alextercete
0
95
Shipping containers
Avatar for Alex Tercete alextercete
0
77
Parallelism and Symmetry
Avatar for Alex Tercete alextercete
0
260
Porting to .NET Standard
Avatar for Alex Tercete alextercete
0
82
Prepping Commits
Avatar for Alex Tercete alextercete
1
150
The end of your line-endings nightmare
Avatar for Alex Tercete alextercete
0
210
ReadyRoll for DotNet developers
Avatar for Alex Tercete alextercete
0
110
Coding Dojo: The Randori Kata
Avatar for Alex Tercete alextercete
1
580
How to be a good pair [programmer]
Avatar for Alex Tercete alextercete
0
150

Other Decks in Programming

See All in Programming
mruby on C#: From VM Implementation to Game Scripting (RubyKaigi 2026)
Avatar for hadashiA hadashia
2
590
iOS機能開発のAI環境と起きた変化
Avatar for Ryu-nakayama ryunakayama
0
190
Offline should be the norm: building local-first apps with CRDTs & Kotlin Multiplatform
Avatar for Renaud MATHIEU renaudmathieu
0
220
事業会社でのセキュリティ長期インターンについて
Avatar for inlet-back masachikaura
0
260
書籍「ユーザーストーリーマッピング」が私のバイブル
Avatar for asumikam asumikam
4
400
2026_04_15_量子計算をパズルとして解く
Avatar for HideakiTakechi hideakitakechi
0
110
PHP で mp3 プレイヤーを実装しよう
Avatar for memory m3m0r7
PRO
0
290
Road to RubyKaigi: Play Hard(ware)
Avatar for makicamel makicamel
1
410
アーキテクチャモダナイゼーションとは何か
Avatar for nwiizo nwiizo
19
5.4k
実用！Hono RPC2026
Avatar for yodaka yodaka
2
250
PCOVから学ぶコードカバレッジ #phpcon_odawara
Avatar for hideki kinjyo o0h
PRO
0
280
TiDBのアーキテクチャから学ぶ分散システム入門 〜MySQL互換のNewSQLは何を解決するのか〜 / tidb-architecture-study
Avatar for DPon dznbk
1
180

Featured

See All Featured
HU Berlin: Industrial-Strength Natural Language Processing with spaCy and Prodigy
Avatar for Ines Montani inesmontani
PRO
0
320
A Soul's Torment
Avatar for Nat Ma seathinner
6
2.7k
Building Applications with DynamoDB
Avatar for Matt Wood mza
96
7k
The SEO identity crisis: Don't let AI make you average
Avatar for Varn varn
0
450
AI Search: Implications for SEO and How to Move Forward - #ShenzhenSEOConference
Avatar for Aleyda Solis aleyda
1
1.2k
A Guide to Academic Writing Using Generative AI - A Workshop
Avatar for Kenji Saito ks91
PRO
1
280
How Software Deployment tools have changed in the past 20 years
Avatar for Geshan Manandhar geshan
0
33k
CoffeeScript is Beautiful & I Never Want to Write Plain JavaScript Again
Avatar for Sam Stephenson sstephenson
162
16k
From π to Pie charts
Avatar for Rasagy Sharma rasagy
0
170
WCS-LA-2024
Avatar for Leonardo Collado-Torres lcolladotor
0
540
Ruling the World: When Life Gets Gamed
Avatar for Sebastian Deterding codingconduct
0
210
Data-driven link building: lessons from a $708K investment (BrightonSEO talk)
Avatar for Szymon Słowik szymonslowik
1
1k

Transcript

  1. Alex Tercete @alextercete I ❤ SUSHI therefore I ❤ REBASE

  2. None

  3. Nourishment & Delight

  4. Nourishment & Delight food

  5. Nourishment & Delight food changes

  6. Nourishment & Delight food changes Survival Satisfaction

  7. Nourishment & Delight food changes Survival Satisfaction

  8. Who here likes sushi?

  9. +

  10. None
  11. None
  12. None

  13. you

  14. you remote

  15. you teammate remote

  16. you teammate remote

  17. $ git push --force-with-lease

  18. you teammate remote

  19. you teammate remote

  20. you teammate remote

  21. you teammate remote

  22. $ git fetch $ git reset --hard … $ git

    cherry-pick …

  23. I ❤ SUSHI therefore I ❤ REBASE

  24. None

  25. 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

  26. $ git add --interactive

  27. None
  28. None
  29. None
  30. None
  31. None

  32. $ git rebase --interactive

  33. None
  34. None
  35. None
  36. None
  37. None
  38. None
  39. None

  40. $ git add --patch $ git diff --check

  41. None
  42. None
  43. None

  44. Alex Tercete @alextercete Thanks!

  45. 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