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

I love sushi, therefore I love rebase

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
Don't Prompt Harder, Structure Better
Avatar for Yusuke Kita kitasuke
0
780
NakouPAY説明用
Avatar for Annouim0 annouim0
0
260
PHP で mp3 プレイヤーを実装しよう
Avatar for memory m3m0r7
PRO
0
290
エラー処理の温故知新 / history of error handling technic
Avatar for nakaryo ryotanakaya
0
130
ふりがな Deep Dive try! Swift Tokyo 2026
Avatar for watura watura
0
230
10年分の技術的負債、完済へ ― Claude Code主導のAI駆動開発でスポーツブルを丸ごとリプレイスした話
Avatar for nero15 takuya_houshima
0
2.6k
GitHubCopilotCLIをはじめよう.pdf
Avatar for tkym htkym
0
240
Terraform言語の静的解析 / static analysis of Terraform language
Avatar for Kazuma Watanabe wata727
1
110
How We Benchmarked Quarkus: Patterns and anti-patterns
Avatar for Holly Cummins hollycummins
1
150
Road to RubyKaigi: Play Hard(ware)
Avatar for makicamel makicamel
1
410
「話せることがない」を乗り越える 〜日常業務から登壇テーマをつくる思考法〜
Avatar for ShoheiMitani shoheimitani
4
850
Lightning-Fast Method Calls with Ruby 4.1 ZJIT / RubyKaigi 2026
Avatar for Takashi Kokubun k0kubun
3
1.1k

Featured

See All Featured
Building Experiences: Design Systems, User Experience, and Full Site Editing
Avatar for Michelle Schulp Hunt marktimemedia
0
480
How to optimise 3,500 product descriptions for ecommerce in one day using ChatGPT
Avatar for Katarina Dahlin katarinadahlin
PRO
1
3.5k
Docker and Python
Avatar for Tania Allard trallard
47
3.8k
Design and Strategy: How to Deal with People Who Don’t "Get" Design
Avatar for Morgane Peng morganepeng
133
19k
Visual Storytelling: How to be a Superhuman Communicator
Avatar for David Neal reverentgeek
2
510
Crafting Experiences
Avatar for Bethany Jepchumba bethany
1
120
Code Reviewing Like a Champion
Avatar for maltzj maltzj
528
40k
世界の人気アプリ100個を分析して見えたペイウォール設計の心得
Avatar for Akihiro Kokubo akihiro_kokubo
PRO
69
39k
Game over? The fight for quality and originality in the time of robots
Avatar for Wayne Barker wayneb77
1
160
Done Done
Avatar for chrislema chrislema
186
16k
Efficient Content Optimization with Google Search Console & Apps Script
Avatar for Katarina Dahlin katarinadahlin
PRO
1
510
Balancing Empowerment & Direction
Avatar for Lara Hogan lara
6
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