update pull strategy

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

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))