feat(16-oopsy): Create the oopsy chapter

Author: Ady-Gould

.obsidian/workspace.json

@@ -4,22 +4,35 @@
     "type": "split",
     "children": [
       {
-        "id": "f854b54e1c2c8592",
+        "id": "8a32cc27797a4d1e",
         "type": "tabs",
         "children": [
           {
-            "id": "e74c320159094cdf",
+            "id": "20e1b75c65c12b41",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "docs/18-workflows.md",
+                "file": "docs/15-diffs.md",
+                "mode": "source",
+                "source": false
+              }
+            }
+          },
+          {
+            "id": "411e3e90803f0f69",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "docs/16-oopsy-undoing-changes.md",
                 "mode": "source",
                 "source": false
               }
             }
           }
-        ]
+        ],
+        "currentTab": 1
       }
     ],
     "direction": "vertical"
@@ -85,7 +98,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "docs/18-workflows.md",
+                "file": "docs/16-oopsy-undoing-changes.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -102,7 +115,7 @@
             "state": {
               "type": "outgoing-link",
               "state": {
-                "file": "docs/18-workflows.md",
+                "file": "docs/16-oopsy-undoing-changes.md",
                 "linksCollapsed": false,
                 "unlinkedCollapsed": true
               }
@@ -125,11 +138,12 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "docs/18-workflows.md"
+                "file": "docs/16-oopsy-undoing-changes.md"
               }
             }
           }
-        ]
+        ],
+        "currentTab": 1
       }
     ],
     "direction": "horizontal",
@@ -147,15 +161,18 @@
       "table-editor-obsidian:Advanced Tables Toolbar": false
     }
   },
-  "active": "e74c320159094cdf",
+  "active": "fdba8d3352084196",
   "lastOpenFiles": [
+    "docs/15-diffs.md",
+    "docs/16-oopsy-undoing-changes.md",
+    "16-.md",
+    "assets/pasted-image-20240315113136.png",
+    "docs/18-workflows.md",
     "assets/Pasted image 20240314154647.png",
     "assets/Pasted image 20240314154551.png",
-    "docs/15-diffs.md",
     "assets/diff-difference.png",
     "assets/diff-hunk-headers.png",
     "assets/diff-header.png",
-    "docs/18-workflows.md",
     "docs/14-forking-over-code.md",
     "assets/Pull-Request-Practice.md",
     "assets/collaboration.png",
@@ -166,7 +183,6 @@
     "assets/pasted-image-20240314105028.png",
     "assets/pasted-image-20240314102512.png",
     "assets/front-cover.svg",
-    "assets/back-cover.svg",
     "assets/BLANK_README.md",
     "LICENSE.md",
     "CHANGELOG.md",
@@ -186,7 +202,6 @@
     "docs/07-ignore-me.md",
     "docs/05-global-settings.md",
     "docs/04-git-started.md",
-    "docs/02-getting-ready.md",
     "docs",
     "assets/brave_dWSQwZYc3F.mp4",
     "themes",

assets/pasted-image-20240315113136.png

@@ -12,28 +12,31 @@ When you run a merge – it is asking the same question.
 
 Pull or push – yep, you guessed it...
 
+### Git Merge explained using Soldiers
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/4zw7dO46XSQ?si=0ssNcD8S-ukHV3R4" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
+
+
 ## What is the difference?
 
 We will want to know there is a difference, but this is often not enough.
 
 When we know there is a difference, we then want to know what the difference is.
 
+You saw an example of differences when you ran a pull request.
 
-•You saw an example of differences when you ran a pull request
-
-•Discuss on what levels were differences highlighted (folder/file/line/word/character)?
-
+![Inside the Pull Request Files Changed - post merge](../assets/pasted-image-20240315113136.png)
 
 ## When can diffs be seen?
 
-•Between files
-
-•Between commits
+You are able to view diffs between a number of 'objects' that make up the Git version control 'history'.
 
-•Between staging (index) and the object database (repo)
-
-•Between the working copy and any of the above
+You may look at diffs between:
 
+- Files
+- Commits
+- Staging (index) and the object database (repo)
+- The working copy and any of the above
 
 # Diff Interpretation
 
@@ -83,10 +86,19 @@ For example:
 
 What line numbers in each file do these changes relate to?
 
+## Git Diff Explained
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/vXN50AmJjgY?si=-hRWjzRZfKLPoOtt" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
 
 
 # References
 
 Content based on the following:
 
-www.oreilly.com. (n.d.). _3. Looking Around: Investigating Your Git Repository - Head First Git [Book]_. [online] Available at: https://learning.oreilly.com/library/view/head-first-git/9781492092506/ch03.html [Accessed 14 Mar. 2024].
+www.oreilly.com. (n.d.). _3. Looking Around: Investigating Your Git Repository - Head First Git [Book]_. [online] Available at: https://learning.oreilly.com/library/view/head-first-git/9781492092506/ch03.html [Accessed 14 Mar. 2024].
+
+www.youtube.com. (n.d.). _Git Diff - Explained_. [online] Available at: https://www.youtube.com/watch?v=vXN50AmJjgY [Accessed 15 Mar. 2024].
+
+
+
+[Forking](14-forking-over-code/md) | [Undoing changes](16-oopsy-undoing-changes.md)

docs/15-diffs.md

@@ -0,0 +1,61 @@
+# Undoing Changes
+
+You've made an error in your commits, merges or such ... do not worry, it happens to the best of us.
+
+Remember that Git stores EVERYTHING.
+
+The problem is that this isn't always the best thing.
+
+We will make errors such as:
+- Accidently add a file you did not want to add.
+- Make a commit you didn’t intend to commit (too soon, wrong branch, etc).
+- Make a commit and decide you want to change it or its commit message.
+- Push a change you didn’t mean to push.
+- Make updates to your working copy you want to remove!
+
+Making these errors will happen at some point.
+
+## We will mend it, we will fix it...
+
+Anything can be fixed but the difficulty level does rise pretty quickly. Some may say exponentially.
+
+In general, there are two strategies:
+- Revert changes by creating a new commit
+- Reset changes by removing them from history
+
+Each has their respective advantages.
+
+|                         | Git Revert                                                   | Git Reset                                                                        |
+| ----------------------- | ------------------------------------------------------------ | -------------------------------------------------------------------------------- |
+| **Operation**           | Creates a new commit that undoes changes                     | Moves the branch pointer to a previous commit                                    |
+| **Commit History**      | Preserves the original commit history                        | Modifies the commit history                                                      |
+| **Branch State**        | Updates the branch with a new commit                         | Moves the branch pointer to a different commit                                   |
+| **Working Directory**   | Does not modify the working directory                        | Can optionally modify the working directory                                      |
+| **Collaboration**       | Safe for shared repositories, as it creates a new commit     | Potentially dangerous for shared repositories, as it rewrites the commit history |
+| **Use Cases**           | Undoing commits, fixing mistakes, reverting changes          | Discarding local commits, cleaning up history, resetting to a previous state     |
+| **Remote Repositories** | Suitable for reverting changes pushed to remote repositories | Not suitable for resetting changes pushed to remote repositories                 |
+
+## Warning: Reset Danger
+
+WARNING: resets are hazardous!
+
+You run the risk of:
+- Losing work.
+- Misaligning the commit history (after push).
+
+## Git Reset
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/iEgCj-d-G5U?si=oHntqxD_L65V_k-E" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
+
+## Git Revert
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/XJqQPNudPSY?si=RapMB35X1eefT6N4" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
+
+# References
+
+A Shot of Code (2023). _Git Reset Visualized_. [online] www.youtube.com. Available at: https://www.youtube.com/watch?v=iEgCj-d-G5U&list=PLvVKmViR0Z7aKwZjgICrjp0wUYMF_IpGX&index=14 [Accessed 15 Mar. 2024].
+
+A shot of code (2023). _Git Revert - Visualised_. [online] www.youtube.com. Available at: https://www.youtube.com/watch?v=XJqQPNudPSY&list=PLvVKmViR0Z7aKwZjgICrjp0wUYMF_IpGX&index=15 [Accessed 15 Mar. 2024].
+
+
+[Diffs](./docs/14-diffs.md) | [Stashing](./docs/17-stashing.md)