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
74
Shipping containers
Avatar for Alex Tercete alextercete
0
59
Parallelism and Symmetry
Avatar for Alex Tercete alextercete
0
230
Porting to .NET Standard
Avatar for Alex Tercete alextercete
0
64
Prepping Commits
Avatar for Alex Tercete alextercete
1
130
The end of your line-endings nightmare
Avatar for Alex Tercete alextercete
0
190
ReadyRoll for DotNet developers
Avatar for Alex Tercete alextercete
0
93
Coding Dojo: The Randori Kata
Avatar for Alex Tercete alextercete
1
530
How to be a good pair [programmer]
Avatar for Alex Tercete alextercete
0
130

Other Decks in Programming

See All in Programming
TypeScript LSP の今までとこれから
Avatar for Yosuke Kurami quramy
0
110
Language Server と喋ろう – TSKaigi 2025
Avatar for pizzacat83 pizzacat83
2
670
少数精鋭エンジニアがフルスタック力を磨く理由 -そしてAI時代へ-
Avatar for 株式会社Rebase_エンジニアリング rebase_engineering
0
130
衛星の軌道をWeb地図上に表示する
Avatar for Takahiro Miyoshi sankichi92
0
250
クラシルリワードにおける
iOSアプリ開発の取り組み
Avatar for fumito nakazawa funzin
1
810
事業戦略を理解してソフトウェアを設計する
Avatar for 増田 亨 masuda220
PRO
7
1.1k
Doma で目指す ORM 最適解
Avatar for Toshihiro Nakamura nakamura_to
1
160
當開發遇上包裝： AI 如何讓產品從想法變成商品
Avatar for Caesar Chi clonn
0
2.6k
漸進。
Avatar for TOMIKAWA Sotaro ssssota
0
1.2k
#QiitaBash TDDでAIに設計イメージを伝える
Avatar for sigma ryosukedtomita
2
1.6k
Spring gRPC で始める gRPC 入門 / Introduction to gRPC with Spring gRPC
Avatar for mackey0225 mackey0225
0
140
ソフトウェア品質特性、意識してますか？AIの真の力を引き出す活用事例 / ai-and-software-quality
Avatar for MinoDriven minodriven
19
6.7k

Featured

See All Featured
Facilitating Awesome Meetings
Avatar for Lara Hogan lara
54
6.4k
Bash Introduction
Avatar for André Augusto Costa Santos 62gerente
614
210k
A Modern Web Designer's Workflow
Avatar for Chris Coyier chriscoyier
693
190k
Design and Strategy: How to Deal with People Who Don’t "Get" Design
Avatar for Morgane Peng morganepeng
129
19k
Automating Front-end Workflow
Avatar for Addy Osmani addyosmani
1370
200k
Product Roadmaps are Hard
Avatar for C. Todd Lombardo iamctodd
PRO
53
11k
"I'm Feeling Lucky" - Building Great Search Experiences for Today's Users (#IAC19)
Avatar for Dan Newman danielanewman
228
22k
Exploring the Power of Turbo Streams & Action Cable | RailsConf2023
Avatar for Kevin Liebholz kevinliebholz
32
5.8k
Designing Dashboards & Data Visualisations in Web Apps
Avatar for Des Traynor destraynor
231
53k
Why You Should Never Use an ORM
Avatar for John Nunemaker jnunemaker
PRO
56
9.4k
No one is an island. Learnings from fostering a developers community.
Avatar for Antonio thoeni
21
3.3k
Into the Great Unknown - MozCon
Avatar for Noah Learner thekraken
39
1.8k

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