update pull strategy

This commit is contained in:
Jacky Zhao 2023-08-03 22:29:46 -07:00
parent 4877a9c934
commit 93986c6e7c
2 changed files with 2 additions and 8 deletions

View File

@ -50,10 +50,6 @@ title: Callouts
>
> Aliases: failure, fail, missing
> [!fail] Failure
>
> Aliases: failure, fail, missing
> [!danger] Error
>
> Aliases: danger, error

View File

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