Oopsy - Getting out of (almost) anything with Git

One of the big advantages of version control is knowing you have a safety net in case anything goes awry. In this workshop, we'll explore common predicaments and discuss how to use the best tool for the job to get out of different those tight spots. While the material we'll cover can help the beginner and the seasoned professional alike, attendees should have a basic working knowledge of Git and be comfortable on the command line.

Transcript

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