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

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
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
230
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
Event is what happens
Avatar for MOROHASHI Kyosuke moro
2
4k
Secure Your Coding Agent Like It’s Malware (v1.5) 🇬🇧 @Code.talks 2026
Avatar for Richard richargh
0
110
作れる、でも消せるか？──安全に「枯らして消す」機能削除術 / Drain, Then Delete
Avatar for chobishiba chobishiba
3
1.5k
AI時代のIaC入門 〜なぜインフラをコードで管理したいのか？〜 / Introduction to IaC in the AI Era
Avatar for アキキー | Akihisa Ikeda akihisaikeda
6
1.5k
React Native経験者が Flutterを30⽇間触って驚いたこと
Avatar for ryota_saito 3saito
0
170
Long Living Tokens, Die, Die, Die! (or: The One Ring is Banned in Modern)
Avatar for sylph01 sylph01
0
420
AIで開発が速くなった先で、開発チームは何を目指すか
Avatar for Yuki Shiho shihochan
1
2k
あなたの await、OS まで届いてる？ strace で覗く JavaScript の非同期
Avatar for hasuto sasaki hasutosasaki
1
2.3k
graphql-ruby を Spinel で速くしようとした話
Avatar for Fumiaki MATSUSHIMA mtsmfm
0
140
Materialが消えた日 〜真っ白なFlutterキャンバスにRenderObjectで絵を描く〜
Avatar for Aoi Umigishi umigishiaoi
0
150
学びを記事・スライド・Xへ高速展開する― AI-assisted Learning Loopで回すコンテンツ生成術
Avatar for Ochtum ochtum
0
200
LLM 101
Avatar for Leonardo YongUk Kim dalinaum
0
480

Featured

See All Featured
Navigating the Design Leadership Dip - Product Design Week Design Leaders+ Conference 2024
Avatar for Andy Polaine apolaine
2
510
Why Our Code Smells
Avatar for Brandon Keepers bkeepers
PRO
340
58k
Abbi's Birthday
Avatar for Violet Bock coloredviolet
4
11k
YesSQL, Process and Tooling at Scale
Avatar for Rocio Delgado rocio
174
15k
Deep Space Network (abreviated)
Avatar for Tony Rice tonyrice
0
410
Building Flexible Design Systems
Avatar for Yesenia Perez-Cruz yeseniaperezcruz
330
41k
How To Stay Up To Date on Web Technology
Avatar for Chris Coyier chriscoyier
790
250k
HDC tutorial
Avatar for Michiel Stock michielstock
2
1k
The Limits of Empathy - UXLibs8
Avatar for Cassini Nazir cassininazir
2
770
A designer walks into a library…
Avatar for Paul Jervis Heath pauljervisheath
211
25k
We Are The Robots
Avatar for Honza Javorek honzajavorek
0
440
The Language of Interfaces
Avatar for Des Traynor destraynor
162
27k

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