update pull strategy

Jacky Zhao

2023-08-04 93986c6e7c8893ae3068bb3ea2ba187e5e1d6f43

 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))
@@ -280,7 +278,7 @@
    await popContentFolder(contentFolder)
    if (argv.push) {
      console.log("Pushing your changes")
      spawnSync("git", ["push", ORIGIN_NAME, QUARTZ_SOURCE_BRANCH], { stdio: "inherit" })
      spawnSync("git", ["push", "-f", ORIGIN_NAME, QUARTZ_SOURCE_BRANCH], { stdio: "inherit" })
    }

    console.log(chalk.green("Done!"))