vault backup: 2024-08-27 09:33:40

This commit is contained in:
Dane Sabo 2024-08-27 09:33:40 -04:00
parent 8f2bd1584e
commit 8c46eb1dfe
2 changed files with 10 additions and 3 deletions

View File

@ -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",

View File

@ -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
```