From d02af6a8ae4c3bea4c94ad63c118d517318146fe Mon Sep 17 00:00:00 2001 From: Jacky Zhao <j.zhao2k19@gmail.com> Date: Tue, 08 Aug 2023 00:34:38 +0000 Subject: [PATCH] architecture, fix vendor prefixing --- content/upgrading.md | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/content/upgrading.md b/content/upgrading.md index 425438d..f9f0c39 100644 --- a/content/upgrading.md +++ b/content/upgrading.md @@ -4,3 +4,13 @@ > [!note] > This is specifically a guide for upgrading Quartz 4 version to a more recent update. If you are coming from Quartz 3, check out the [[migrating from Quartz 3|migration guide]] for more info. + +To fetch the latest Quartz updates, simply do + +``` +npx quartz upgrade +``` + +As Quartz uses [git](https://git-scm.com/) under the hood for versioning, updating effectively 'pulls' in the updates from the official Quartz GitHub repository. If you have local changes that might conflict with the updates, you may need to resolve these manually yourself. + +If you have the [GitHub desktop app](https://desktop.github.com/), this will automatically open to help you resolve the conflicts. Otherwise, you will need to resolve this in a text editor like VSCode. For more help on resolving conflicts manually, check out the [GitHub guide on resolving merge conflicts](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line#competing-line-change-merge-conflicts). -- Gitblit v1.10.0