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
120

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
87
Shipping containers
Avatar for Alex Tercete alextercete
0
70
Parallelism and Symmetry
Avatar for Alex Tercete alextercete
0
250
Porting to .NET Standard
Avatar for Alex Tercete alextercete
0
76
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
99
Coding Dojo: The Randori Kata
Avatar for Alex Tercete alextercete
1
570
How to be a good pair [programmer]
Avatar for Alex Tercete alextercete
0
140

Other Decks in Programming

See All in Programming
Implementation Patterns
Avatar for Denys Poltorak denyspoltorak
0
280
AIフル活用時代だからこそ学んでおきたい働き方の心得
Avatar for shinoyu shinoyu
0
130
AI前提で考えるiOSアプリのモダナイズ設計
Avatar for 野瀬田　裕樹 yuukiw00w
0
220
プロダクトオーナーから見たSOC2 _SOC2ゆるミートアップ#2
Avatar for Kenta Suzuki kekekenta
0
200
フルサイクルエンジニアリングをAI Agentで全自動化したい 〜構想と現在地〜
Avatar for Kaito Minatoya kamina_zzz
0
400
AgentCoreとHuman in the Loop
Avatar for Har1101 har1101
5
220
AI時代のキャリアプラン「技術の引力」からの脱出と「問い」へのいざない / tech-gravity
Avatar for MinoDriven minodriven
20
6.4k
メルカリのリーダビリティチームが取り組む、AI時代のスケーラブルな品質文化
Avatar for osari.k cloverrose
2
510
humanlayerのブログから学ぶ、良いCLAUDE.mdの書き方
Avatar for Yuto tsukamoto1783
0
180
Fluid Templating in TYPO3 14
Avatar for Simon Praetorius s2b
0
130
Grafana：建立系統全知視角的捷徑
Avatar for Blueswen blueswen
0
320
Honoを使ったリモートMCPサーバでAIツールとの連携を加速させる！
Avatar for とすり tosuri13
1
170

Featured

See All Featured
ピンチをチャンスに：未来をつくるプロダクトロードマップ #pmconf2020
Avatar for Aki / @LoveIdahoBurger aki_iinuma
128
55k
Utilizing Notion as your number one productivity tool
Avatar for Mfonobong Umondia mfonobong
2
210
Optimising Largest Contentful Paint
Avatar for Harry Roberts csswizardry
37
3.6k
Keith and Marios Guide to Fast Websites
Avatar for Keith Pitt keithpitt
413
23k
The Language of Interfaces
Avatar for Des Traynor destraynor
162
26k
Building Experiences: Design Systems, User Experience, and Full Site Editing
Avatar for Michelle Schulp Hunt marktimemedia
0
400
The Myth of the Modular Monolith - Day 2 Keynote - Rails World 2024
Avatar for Eileen M. Uchitelle eileencodes
26
3.3k
Kristin Tynski - Automating Marketing Tasks With AI
Avatar for Tech SEO Connect techseoconnect
PRO
0
130
Rebuilding a faster, lazier Slack
Avatar for samanthasiow samanthasiow
85
9.4k
Prompt Engineering for Job Search
Avatar for Mfonobong Umondia mfonobong
0
160
Rails Girls Zürich Keynote
Avatar for Gregor Martynus gr2m
96
14k
Faster Mobile Websites
Avatar for Dean Hume deanohume
310
31k

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