Upgrade to Pro — share decks privately, control downloads, hide ads and more …
Sign up for free

I love sushi, therefore I love rebase

Sponsored · Ship Features Fearlessly Turn features on and off without deploys. Used by thousands of Ruby developers. →
Avatar for Alex Tercete Alex Tercete
November 29, 2016
Programming
130
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
120
Shipping containers
Avatar for Alex Tercete alextercete
0
89
Parallelism and Symmetry
Avatar for Alex Tercete alextercete
0
280
Porting to .NET Standard
Avatar for Alex Tercete alextercete
0
93
Prepping Commits
Avatar for Alex Tercete alextercete
1
170
The end of your line-endings nightmare
Avatar for Alex Tercete alextercete
0
220
ReadyRoll for DotNet developers
Avatar for Alex Tercete alextercete
0
120
Coding Dojo: The Randori Kata
Avatar for Alex Tercete alextercete
1
610
How to be a good pair [programmer]
Avatar for Alex Tercete alextercete
0
170

Other Decks in Programming

See All in Programming
AWS CDKを理解するために公式の定義を深掘って解説してみる / Understanding AWS CDK by Digging into Its Official Definition
Avatar for アキキー | Akihisa Ikeda akihisaikeda
2
230
graphql-ruby を Spinel で速くしようとした話
Avatar for Fumiaki MATSUSHIMA mtsmfm
0
140
まずはコードより業務と向き合う：テーブル解体のためにPdMを呼んだ話
Avatar for さかうぇ sakawe_ee
0
140
高橋メソッドでCVE解説シリーズ 〜CVE-2026-112816〜
Avatar for Hakkadaikon hakkadaikon
0
200
あなたの await、OS まで届いてる？ strace で覗く JavaScript の非同期
Avatar for hasuto sasaki hasutosasaki
1
1.9k
[JA] Domain Modeling with Vanilla Rails: 「操作」から再考するRailsの設計論
Avatar for Yuichi Goto yasaichi
4
1.8k
No More NoSuchMethodError
Avatar for TATSUNO Yasuhiro exoego
1
120
私なりのハーネスエンジニアリング ～独自の言語処理系の開発を通して～
Avatar for 瀬尾佳隆 seosoft
0
180
우리의 Nitro Modules는 당신의 Turbo Modules보다 아름답다
Avatar for HyunWoo Lee l2hyunwoo
0
250
Goコンパイラを作ってGoをもっと理解する / Build a Go compiler to better understand Go
Avatar for ikura-hamu ikura_hamu
0
120
GraphQL の onError と Nullability のこれから
Avatar for Yosuke Kurami quramy
0
200
AIが生成したコードは読むべきか？抽象化設計とコードの品質保証 / abstraction-design-and-quality
Avatar for MinoDriven minodriven
16
8.5k

Featured

See All Featured
Kristin Tynski - Automating Marketing Tasks With AI
Avatar for Tech SEO Connect techseoconnect
PRO
0
580
Documentation Writing (for coders)
Avatar for Carmen Chung carmenintech
77
5.6k
How to train your dragon (web standard)
Avatar for Monica Dinculescu notwaldorf
96
6.9k
Stewardship and Sustainability of Urban and Community Forests
Avatar for Eric Wiseman pwiseman
0
590
Practical Orchestrator
Avatar for Shlomi Noach shlominoach
192
12k
How Fast Is Fast Enough? [PerfNow 2025]
Avatar for Tammy Everts tammyeverts
3
970
Testing 201, or: Great Expectations
Avatar for Joseph Mastey jmmastey
46
8.4k
Improving Core Web Vitals using Speculation Rules API
Avatar for Sergey Chernyshev sergeychernyshev
21
1.7k
AI in Enterprises - Java and Open Source to the Rescue
Avatar for ivargrimstad ivargrimstad
0
1.6k
Winning Ecommerce Organic Search in an AI Era - #searchnstuff2025
Avatar for Aleyda Solis aleyda
2
2.2k
Faster Mobile Websites
Avatar for Dean Hume deanohume
310
32k
The Cult of Friendly URLs
Avatar for Andy Hume andyhume
79
7.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