From 8c46eb1dfe67a1353040b0aeaeb59d8e933bf209 Mon Sep 17 00:00:00 2001
From: Dane Sabo <dane.sabo@pitt.edu>
Date: Tue, 27 Aug 2024 09:33:40 -0400
Subject: [PATCH] vault backup: 2024-08-27 09:33:40

---
 .obsidian/workspace.json                                | 5 ++---
 6. Researching Techniques/Learning How to Use Github.md | 8 ++++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 0161b1ef..cac7070d 100755
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -35,8 +35,7 @@
               "state": {}
             }
           }
-        ],
-        "currentTab": 2
+        ]
       }
     ],
     "direction": "vertical"
@@ -166,7 +165,7 @@
       "obsidian-full-calendar:Open Full Calendar": false
     }
   },
-  "active": "d0de827fb7842328",
+  "active": "a14e8baae9ae45e1",
   "lastOpenFiles": [
     "900. Calendars/2. Research/2024-08-26 Fighting with the BeagleBone.md",
     "6. Researching Techniques/Learning How to Use Github.md",
diff --git a/6. Researching Techniques/Learning How to Use Github.md b/6. Researching Techniques/Learning How to Use Github.md
index 420e1214..00c431cb 100755
--- a/6. Researching Techniques/Learning How to Use Github.md	
+++ b/6. Researching Techniques/Learning How to Use Github.md	
@@ -75,3 +75,11 @@ git switch -c new-branch
 git push -u origin new-branch
 #git push (set new pushes to new branch spec) (remote destination) (branch name)
 ```
+
+## Quirks with GitHub and Obsidian:
+If plugins change, git will throw up concerns about the obsidian.json file being different. This can be fixed by resetting the local files and pulling again. This only works because we know there's no other changes between the two sets.
+```bash
+git fetch --all #pull the files from the server. Can check differences between branches
+git reset --hard origin/master
+git pull
+```
\ No newline at end of file