I MESS UP. A LOT.
Allen Smith
@loranllensmith@loranallensmith
Slide 11
Slide 11 text
No content
Slide 12
Slide 12 text
No content
Slide 13
Slide 13 text
No content
Slide 14
Slide 14 text
No content
Slide 15
Slide 15 text
No content
Slide 16
Slide 16 text
OOPSY.
Slide 17
Slide 17 text
GETTING OUT OF (ALMOST)
ANYTHING WITH GIT
Slide 18
Slide 18 text
GETTING OUT OF (ALMOST)
ANYTHING WITH GIT
Slide 19
Slide 19 text
BACKGROUND
SCENARIOS
IN THIS SESSION:
Slide 20
Slide 20 text
HTTPS://GITHUB.COM/LORANALLENSMITH/OOPSY
Slide 21
Slide 21 text
No content
Slide 22
Slide 22 text
GIT KEEPS
EVERYTHING
Slide 23
Slide 23 text
GIT KEEPS (ALMOST)
EVERYTHING
Slide 24
Slide 24 text
!
!
!
!
Slide 25
Slide 25 text
ee7a6eb
a909e4d
bc4ea15
c9d083c
Slide 26
Slide 26 text
!
!
!
!
Slide 27
Slide 27 text
! ! ! !
Slide 28
Slide 28 text
! ! ! !
MASTER
HEAD
Slide 29
Slide 29 text
! ! ! !
MASTER
HEAD
! ! !
FEATURE
Slide 30
Slide 30 text
A B C E
MASTER
HEAD
D F G
FEATURE
Slide 31
Slide 31 text
"
"
"
"
#
Slide 32
Slide 32 text
"
"
"
"
"
Slide 33
Slide 33 text
"
"
"
"
"
Slide 34
Slide 34 text
"
"
"
"
"
Slide 35
Slide 35 text
REWRITING
HISTORY
Slide 36
Slide 36 text
" A B C D E
" A B’ C’ D’ E’
O/MASTER
MASTER
Slide 37
Slide 37 text
" A
O/MASTER
" A B’ C’ D’ E’
MASTER
B’ C’ D’ E’
Slide 38
Slide 38 text
" A
O/MASTER
" A B C D E
MASTER
B’ C’ D’ E’
Slide 39
Slide 39 text
" A
" A B C D E
O/MASTER
MASTER
B’ C’ D’ E’
FEATURE
F
Slide 40
Slide 40 text
was it something I force pushed?
Slide 41
Slide 41 text
DON’T REWRITE
ANYTHING THAT IS
PUBLIC.
Slide 42
Slide 42 text
DON’T REWRITE
ANYTHING THAT IS
PUBLIC. UNLESS YOU HAVE…
‣ EXHAUSTED ALL OTHER OPTIONS
‣ DISCUSSED IT WITH YOUR COLLABORATORS
‣ CREATED A PLAN FOR UPDATING
Slide 43
Slide 43 text
PICKLES
Slide 44
Slide 44 text
I NEED TO UNDO
SOMETHING PUBLIC.
Slide 45
Slide 45 text
$ git revert
" A B C D E -B
FEATURE
Slide 46
Slide 46 text
I JUST COMMITTED,
BUT I NEED TO
MAKE A CHANGE.
Slide 47
Slide 47 text
EVERYTHING IS AWFUL.
Slide 48
Slide 48 text
FUBAR
Slide 49
Slide 49 text
FUBAR
FILE UNUSABLE BUT APPRECIABLY REFACTORED
Slide 50
Slide 50 text
$ git checkout --
" A B C D
FEATURE
$
file.txt
HEAD
Slide 51
Slide 51 text
EVERYTHING I HAVE
COMMITTED IS AWFUL.
Slide 52
Slide 52 text
$ git reset --hard
" A B C D
FEATURE
$
file.txt
HEAD
$
file.js
$
file.css
E F
Slide 53
Slide 53 text
I HAVE MADE A
HUGE MISTAKE.
Slide 54
Slide 54 text
No content
Slide 55
Slide 55 text
No content
Slide 56
Slide 56 text
REFLOG
Slide 57
Slide 57 text
REFLOG
TRACKS WHERE YOUR POINTERS HAVE POINTED
Slide 58
Slide 58 text
" A B C D
FEATURE
HEAD
E F
Slide 59
Slide 59 text
$ git reset --hard
" A B C D
FEATURE
$
file.txt
HEAD
$
file.js
$
file.css
E F
Slide 60
Slide 60 text
$ git reset --hard
" A B C D
FEATURE
HEAD
E F
Slide 61
Slide 61 text
I ACCIDENTALLY
COMMITTED TO
MASTER
Slide 62
Slide 62 text
" A B C D
MASTER
HEAD
E F
ORIGIN/MASTER
Slide 63
Slide 63 text
$ git branch
" A B C D
MASTER
HEAD
E F
ORIGIN/MASTER
Slide 64
Slide 64 text
$ git branch
" A B C D
MASTER
HEAD
E F
FEATURE
ORIGIN/MASTER
Slide 65
Slide 65 text
$ git reset --hard origin/master
" A B C D
MASTER
HEAD
E F
FEATURE
ORIGIN/MASTER
Slide 66
Slide 66 text
$ git reset --hard origin/master
" A B C D
MASTER
HEAD
E F
FEATURE
ORIGIN/MASTER
Slide 67
Slide 67 text
I WANT TO
BRANCH, BUT
MASTER KEEPS
CHANGING.
Slide 68
Slide 68 text
$ git rebase master
" A B E F
FEATURE
HEAD
C D
MASTER
Slide 69
Slide 69 text
$ git rebase master
" A B E F
FEATURE
HEAD
C D
MASTER
C’ D’
Slide 70
Slide 70 text
SURE, I HAVE
MADE SOME
MISTAKES. BUT
THAT’S ALL IN
THE PAST NOW.
Slide 71
Slide 71 text
$ git rebase --interactive
" A B C D
FEATURE
HEAD
E F
MASTER
Slide 72
Slide 72 text
$ git rebase --interactive
" A C’ (B+E)’ D’
FEATURE
HEAD
F’
MASTER
Slide 73
Slide 73 text
I FORGOT
SOMETHING IN
THAT COMMIT I
JUST MADE.
LAST MONTH.
Slide 74
Slide 74 text
$ git commit --fixup
" A B C D
FEATURE
HEAD
E F
MASTER
Slide 75
Slide 75 text
$ git rebase --autosquash -i
" A (B+F)’ C’ D’
FEATURE
HEAD
E’
MASTER
Slide 76
Slide 76 text
>
Slide 77
Slide 77 text
GET INPUT
FROM OTHERS
Slide 78
Slide 78 text
VERSION
CONTROL
Slide 79
Slide 79 text
VERSION
CONTROL IS THE STORY OF
HOW YOU MADE IT
A B C