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

I love sushi, therefore I love rebase

Alex Tercete
November 29, 2016
Programming
0
99

I love sushi, therefore I love rebase

Give sushi and rebase a second chance!

Alex Tercete

November 29, 2016
Tweet

More Decks by Alex Tercete

See All by Alex Tercete
Making Makefiles
alextercete
0
57
Shipping containers
alextercete
0
50
Parallelism and Symmetry
alextercete
0
170
Porting to .NET Standard
alextercete
0
53
Prepping Commits
alextercete
1
120
The end of your line-endings nightmare
alextercete
0
160
ReadyRoll for DotNet developers
alextercete
0
84
Coding Dojo: The Randori Kata
alextercete
1
400
How to be a good pair [programmer]
alextercete
0
110

Other Decks in Programming

See All in Programming
Rethinking UI building strategies @ SFI 2024
letelete
0
270
効率化に挑戦してみたらモバイル開発が少し快適になった話
ryunakayama
0
130
SIMD Parallel Programming with the Vector API
josepaumard
0
180
ゆるい個人開発のススメ
kuroppe1819
10
990
検証も兼ねて個人開発でHonoとかと向き合った話
hanetsuki
1
1.1k
Let's learn code review
riofujimon
2
430
Code Reviews
bkuhlmann
4
890
Prepare for Jakarta EE 11 - Performance and Developer Productivity
ivargrimstad
0
820
スクラムガイドのスプリントレトロスペクティブを改めて読みかえしてみた / Re-reading the Sprint Retrospective Section in the Scrum Guide
mackey0225
3
430
[技育CAMPアカデミア]アイディアを形に！【超入門】スマホアプリ開発〜リリースまでの流れをご紹介
teamlab
PRO
0
380
PHPの次期バージョンはこの時期どうなっているのか - Internalsの開発体制について - PHPカンファレンス小田原
youkidearitai
PRO
1
190
Git Lint
bkuhlmann
4
750

Featured

See All Featured
Git: the NoSQL Database
bkeepers
PRO
422
63k
Put a Button on it: Removing Barriers to Going Fast.
kastner
58
3.1k
Debugging Ruby Performance
tmm1
70
11k
A Philosophy of Restraint
colly
197
16k
ReactJS: Keep Simple. Everything can be a component!
pedronauck
659
120k
Teambox: Starting and Learning
jrom
128
8.4k
The Cost Of JavaScript in 2023
addyosmani
16
3.9k
Optimising Largest Contentful Paint
csswizardry
8
2.4k
Cheating the UX When There Is Nothing More to Optimize - PixelPioneers
stephaniewalter
274
13k
Build your cross-platform service in a week with App Engine
jlugia
225
17k
Building Flexible Design Systems
yeseniaperezcruz
319
37k
Agile that works and the tools we love
rasmusluckow
325
20k

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