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
76
Parallelism and Symmetry
Avatar for Alex Tercete alextercete
0
260
Porting to .NET Standard
Avatar for Alex Tercete alextercete
0
81
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
RSAが破られる前に知っておきたい 耐量子計算機暗号(PQC)入門 / Intro to PQC: Preparing for the Post-RSA Era
Avatar for mackey0225 mackey0225
3
130
「接続」—パフォーマンスチューニングの最後の一手 〜点と点を結ぶ、その一瞬のために〜
Avatar for 武田 憲太郎 kentaroutakeda
5
2.5k
Linux Kernelの1文字のミスで 権限昇格ができた話
Avatar for rona rqda
0
2.3k
ネイティブアプリとWebフロントエンドのAPI通信ラッパーにおける共通化の勘所
Avatar for Suguru Ohki suguruooki
0
260
KagglerがMixSeekを触ってみた
Avatar for Morim morim
0
370
アーキテクチャモダナイゼーションとは何か
Avatar for nwiizo nwiizo
17
4.8k
今こそ押さえておきたい アマゾンウェブサービス（AWS）の データベースの基礎 おもクラ #6版
Avatar for Satoshi Kaneyasu satoshi256kbyte
1
240
10年分の技術的負債、完済へ ― Claude Code主導のAI駆動開発でスポーツブルを丸ごとリプレイスした話
Avatar for nero15 takuya_houshima
0
2.3k
AIエージェントで業務改善してみた
Avatar for takumi taku271
0
500
3分でわかるatama plusのQA/about atama plus QA
Avatar for atama plus atamaplus
0
130
「話せることがない」を乗り越える 〜日常業務から登壇テーマをつくる思考法〜
Avatar for ShoheiMitani shoheimitani
4
690
How Swift's Type System Guides AI Agents
Avatar for Yuta Koshizawa koher
0
210

Featured

See All Featured
The Pragmatic Product Professional
Avatar for Laura Van Doore lauravandoore
37
7.2k
Game over? The fight for quality and originality in the time of robots
Avatar for Wayne Barker wayneb77
1
160
Getting science done with accelerated Python computing platforms
Avatar for Jacob Tomlinson jacobtomlinson
2
170
Improving Core Web Vitals using Speculation Rules API
Avatar for Sergey Chernyshev sergeychernyshev
21
1.4k
XXLCSS - How to scale CSS and keep your sanity
Avatar for Zaharenia Atzitzikaki sugarenia
249
1.3M
How to train your dragon (web standard)
Avatar for Monica Dinculescu notwaldorf
97
6.6k
Taking LLMs out of the black box: A practical guide to human-in-the-loop distillation
Avatar for Ines Montani inesmontani
PRO
3
2.1k
The Anti-SEO Checklist Checklist. Pubcon Cyber Week
Avatar for Ryan Jones ryanjones
0
120
The Art of Programming - Codeland 2020
Avatar for Erika Heidi erikaheidi
57
14k
Practical Tips for Bootstrapping Information Extraction Pipelines
Avatar for Matthew Honnibal honnibal
25
1.8k
SEOcharity - Dark patterns in SEO and UX: How to avoid them and build a more ethical web
Avatar for Sara Fernández Carmona sarafernandez
0
160
Lightning Talk: Beautiful Slides for Beginners
Avatar for Ines Montani inesmontani
PRO
1
510

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