From d0f67d993507219cfa0824db8a3e59286f0ebf09 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Mon, 21 Aug 2023 01:41:37 +0000
Subject: [PATCH] move wss server start after http

---
 content/upgrading.md |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/content/upgrading.md b/content/upgrading.md
index a4c2d4a..a3a8275 100644
--- a/content/upgrading.md
+++ b/content/upgrading.md
@@ -13,4 +13,7 @@
 
 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 (or, pull manually using `git pull origin upstream`).
 
+> [!hint]
+> Quartz will try to cache your content before updating to try and prevent merge conflicts. If you get a conflict mid-merge, you can stop the merge and then run `npx quartz restore` to restore your content from the cache.
+
 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