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
69
Parallelism and Symmetry
Avatar for Alex Tercete alextercete
0
250
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
alien-signals と自作 OSS で実現する フレームワーク非依存な ロジック共通化の探求 / Exploring Framework-Agnostic Logic Sharing with alien-signals and Custom OSS
Avatar for aose aoseyuu
2
230
iOSでSVG画像を扱う
Avatar for Kishikawa Katsumi kishikawakatsumi
0
160
CSC305 Lecture 10
Avatar for Javier Gonzalez-Sanchez javiergs
PRO
0
220
What Spring Developers Should Know About Jakarta EE
Avatar for ivargrimstad ivargrimstad
0
430
エンジニアインターン「Treasure」とHonoの2年、そして未来へ / Our Journey with Hono Two Years at Treasure and Beyond
Avatar for CARTA Engineering carta_engineering
0
410
タスクの特性や不確実性に応じた最適な作業スタイルの選択（ペアプロ・モブプロ・ソロプロ）と実践 / Optimal Work Style Selection: Pair, Mob, or Solo Programming.
Avatar for yuki honyanya
3
190
SODA - FACT BOOK（JP）
Avatar for SODA inc. sodainc
1
8.6k
AkarengaLT vol.38
Avatar for hashimoto-kei hashimoto_kei
1
120
3年ぶりにコードを書いた元CTOが Claude Codeと30分でMVPを作った話
Avatar for 小島舞子 / Maiko Kojima maikokojima
0
620
コードとあなたと私の距離 / The Distance Between Code, You, and I
Avatar for YAMAOKA Hiroyuki hiro_y
0
190
The Past, Present, and Future of Enterprise Java
Avatar for ivargrimstad ivargrimstad
0
190
Devoxx BE - Local Development in the AI Era
Avatar for Kevin Dubois kdubois
0
140

Featured

See All Featured
Scaling GitHub
Avatar for Zach Holman holman
463
140k
Dealing with People You Can't Stand - Big Design 2015
Avatar for Cassini Nazir cassininazir
367
27k
The Cult of Friendly URLs
Avatar for Andy Hume andyhume
79
6.6k
The MySQL Ecosystem @ GitHub 2015
Avatar for Sam Lambert samlambert
251
13k
Optimizing for Happiness
Avatar for Tom Preston-Werner mojombo
379
70k
Stop Working from a Prison Cell
Avatar for Chris Michel hatefulcrawdad
271
21k
Improving Core Web Vitals using Speculation Rules API
Avatar for Sergey Chernyshev sergeychernyshev
21
1.2k
How to train your dragon (web standard)
Avatar for Monica Dinculescu notwaldorf
97
6.3k
GitHub's CSS Performance
Avatar for Jon Rohan jonrohan
1032
470k
[Rails World 2023 - Day 1 Closing Keynote] - The Magic of Rails
Avatar for Eileen M. Uchitelle eileencodes
37
2.6k
The Pragmatic Product Professional
Avatar for Laura Van Doore lauravandoore
36
7k
Why Our Code Smells
Avatar for Brandon Keepers bkeepers
PRO
340
57k

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