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
0
110

I love sushi, therefore I love rebase

Give sushi and rebase a second chance!

Avatar for Alex Tercete

Alex Tercete

November 29, 2016
Tweet

More Decks by Alex Tercete

See All by Alex Tercete
Making Makefiles
Avatar for Alex Tercete alextercete
0
83
Shipping containers
Avatar for Alex Tercete alextercete
0
68
Parallelism and Symmetry
Avatar for Alex Tercete alextercete
0
240
Porting to .NET Standard
Avatar for Alex Tercete alextercete
0
70
Prepping Commits
Avatar for Alex Tercete alextercete
1
140
The end of your line-endings nightmare
Avatar for Alex Tercete alextercete
0
200
ReadyRoll for DotNet developers
Avatar for Alex Tercete alextercete
0
96
Coding Dojo: The Randori Kata
Avatar for Alex Tercete alextercete
1
560
How to be a good pair [programmer]
Avatar for Alex Tercete alextercete
0
130

Other Decks in Programming

See All in Programming
Dart 参戦！！静的型付き言語界の隠れた実力者
Avatar for Kuno Ayana kno3a87
0
200
LLMは麻雀を知らなすぎるから俺が教育してやる
Avatar for po3rin po3rin
3
2.1k
書き捨てではなく継続開発可能なコードをAIコーディングエージェントで書くために意識していること
Avatar for ShuyaKinjo shuyakinjo
1
270
あまり知られていない MCP 仕様たち / MCP specifications that aren’t widely known
Avatar for ktr ktr_0731
0
270
Vibe coding コードレビュー
Avatar for kinopee kinopeee
0
440
AHC051解法紹介
Avatar for eijirou eijirou
0
550
Flutterと Vibe Coding で個人開発！
Avatar for Hayami Shuhei hyshu
1
250
コーディングは技術者(エンジニア)の嗜みでして / Learning the System Development Mindset from Rock Lady
Avatar for mackey0225 mackey0225
2
490
バイブコーディングの正体——AIエージェントはソフトウェア開発を変えるか？
Avatar for Shinichi Takayanagi stakaya
5
930
State of CSS 2025
Avatar for Benjamin Kott benjaminkott
1
100
パスタの技術
Avatar for Yusuke Wada yusukebe
1
380
Scale out your Claude Code ~⁨⁩自社専用Agentで10xする開発プロセス~
Avatar for Yuku Kotani yukukotani
9
2.2k

Featured

See All Featured
GraphQLの誤解/rethinking-graphql
Avatar for sonatard sonatard
71
11k
Building a Modern Day 
E-commerce SEO Strategy
Avatar for Aleyda Solis aleyda
43
7.4k
The Myth of the Modular Monolith - Day 2 Keynote - Rails World 2024
Avatar for Eileen M. Uchitelle eileencodes
26
3k
Helping Users Find Their Own Way: Creating Modern Search Experiences
Avatar for Dan Newman danielanewman
29
2.8k
Sharpening the Axe: The Primacy of Toolmaking
Avatar for Bryan Cantrill bcantrill
44
2.4k
Code Review Best Practice
Avatar for Trisha Gee trishagee
69
19k
[RailsConf 2023 Opening Keynote] The Magic of Rails
Avatar for Eileen M. Uchitelle eileencodes
30
9.6k
JavaScript: Past, Present, and Future - NDC Porto 2020
Avatar for David Neal reverentgeek
50
5.5k
Keith and Marios Guide to Fast Websites
Avatar for Keith Pitt keithpitt
411
22k
Large-scale JavaScript Application Architecture
Avatar for Addy Osmani addyosmani
512
110k
CoffeeScript is Beautiful & I Never Want to Write Plain JavaScript Again
Avatar for Sam Stephenson sstephenson
161
15k
Art, The Web, and Tiny UX
Avatar for Lynn Fisher lynnandtonic
301
21k

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