update pull strategy

2023-08-03 22:29:46 -07:00
parent 2b5dc84c41
commit 0a83b89a33
2 changed files with 2 additions and 8 deletions
--- 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))