Before updating Quartz

This website is populated using Obsidian, converted to a static website using Quartz, uploaded to GitHub and deployed and hosted on Vercel.

Updating Quartz

To make the site look as good as it does (patting my back here), some files that need to be minded when updating and merging with the main branch of Quartz.

Warning

When updating, keep an eye on:
quartz.layout.ts,
quartz.config.ts,
quartz/styles/custom.scss,
quartz/components/Footer.tsx,
quartz/components/styles/explorer.scss,
quartz/styles/custom.scss
and make sure they stay the same.

1. Close Obsidian first.
2. Make a new branch from the origin on GitHub,
3. Ensure upstream is Correctly Set by running:

git remote -v

4. Then fetch the changes and merge them as follows:

git fetch upstream
git merge upstream/v4 --allow-unrelated-histories

5. Finally, resolve all conflicts manually from the GitHub Desktop app (which is the boring part)