Tweet
Tweet

Slide 1

Slide 1 text

Alex Tercete @alextercete I ❤ SUSHI therefore I ❤ REBASE

Slide 2

Slide 2 text

No content

Slide 3

Slide 3 text

Nourishment & Delight

Slide 4

Slide 4 text

Nourishment & Delight food

Slide 5

Slide 5 text

Nourishment & Delight food changes

Slide 6

Slide 6 text

Nourishment & Delight food changes Survival Satisfaction

Slide 7

Slide 7 text

Nourishment & Delight food changes Survival Satisfaction

Slide 8

Slide 8 text

Who here likes sushi?

Slide 9

Slide 9 text

+

Slide 10

Slide 10 text

No content

Slide 11

Slide 11 text

No content

Slide 12

Slide 12 text

No content

Slide 13

Slide 13 text

you

Slide 14

Slide 14 text

you remote

Slide 15

Slide 15 text

you teammate remote

Slide 16

Slide 16 text

you teammate remote

Slide 17

Slide 17 text

$ git push --force-with-lease

Slide 18

Slide 18 text

you teammate remote

Slide 19

Slide 19 text

you teammate remote

Slide 20

Slide 20 text

you teammate remote

Slide 21

Slide 21 text

you teammate remote

Slide 22

Slide 22 text

$ git fetch $ git reset --hard … $ git cherry-pick …

Slide 23

Slide 23 text

I ❤ SUSHI therefore I ❤ REBASE

Slide 24

Slide 24 text

No content

Slide 25

Slide 25 text

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

Slide 26

Slide 26 text

$ git add --interactive

Slide 27

Slide 27 text

No content

Slide 28

Slide 28 text

No content

Slide 29

Slide 29 text

No content

Slide 30

Slide 30 text

No content

Slide 31

Slide 31 text

No content

Slide 32

Slide 32 text

$ git rebase --interactive

Slide 33

Slide 33 text

No content

Slide 34

Slide 34 text

No content

Slide 35

Slide 35 text

No content

Slide 36

Slide 36 text

No content

Slide 37

Slide 37 text

No content

Slide 38

Slide 38 text

No content

Slide 39

Slide 39 text

No content

Slide 40

Slide 40 text

$ git add --patch $ git diff --check

Slide 41

Slide 41 text

No content

Slide 42

Slide 42 text

No content

Slide 43

Slide 43 text

No content

Slide 44

Slide 44 text

Alex Tercete @alextercete Thanks!

Slide 45

Slide 45 text

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