From 93986c6e7c8893ae3068bb3ea2ba187e5e1d6f43 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 3 Aug 2023 22:29:46 -0700
Subject: [PATCH] update pull strategy

---
 content/features/callouts.md | 4 ----
 quartz/bootstrap-cli.mjs     | 6 ++----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/content/features/callouts.md b/content/features/callouts.md
index 15b689c2..cb5feb9d 100644
--- a/content/features/callouts.md
+++ b/content/features/callouts.md
@@ -50,10 +50,6 @@ title: Callouts
 >
 > Aliases: failure, fail, missing
 
-> [!fail] Failure
->
-> Aliases: failure, fail, missing
-
 > [!danger] Error
 >
 > Aliases: danger, error
diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs
index 4013a20c..04ed3a2d 100755
--- a/quartz/bootstrap-cli.mjs
+++ b/quartz/bootstrap-cli.mjs
@@ -121,10 +121,8 @@ async function popContentFolder(contentFolder) {
 }
 
 function gitPull(origin, branch) {
-  spawnSync("git", ["fetch", origin, branch], { stdio: "inherit" })
-  spawnSync("git", ["checkout", `${origin}/${branch}`, "--", ":(exclude)content"], {
-    stdio: "inherit",
-  }).error
+  const flags = ["-s", "recursive", "-X", "ours"]
+  spawnSync("git", ["pull", ...flags, origin, branch], { stdio: "inherit" })
 }
 
 yargs(hideBin(process.argv))