update pull strategy

Jacky Zhao

2023-08-04 93986c6e7c8893ae3068bb3ea2ba187e5e1d6f43

update pull strategy

 content/features/callouts.md

@@ -50,10 +50,6 @@
>
> Aliases: failure, fail, missing

> [!fail] Failure
>
> Aliases: failure, fail, missing

> [!danger] Error
>
> Aliases: danger, error

 quartz/bootstrap-cli.mjs

@@ -121,10 +121,8 @@
}

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