I love sushi, therefore I love rebase

Give sushi and rebase a second chance!

Transcript

1. Alex Tercete @alextercete I ❤ SUSHI therefore I ❤ REBASE
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. +
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
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
32. $ git rebase --interactive
40. $ git add --patch $ git diff --check
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