From 5537ca41e0069725e98ef9ad59a2d4dbaa0bd8ae Mon Sep 17 00:00:00 2001 From: Jacky Zhao Date: Wed, 2 Aug 2023 22:16:32 -0700 Subject: [PATCH] use autostash and pull --- quartz/bootstrap-cli.mjs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs index 0bf27aa..81715ad 100755 --- a/quartz/bootstrap-cli.mjs +++ b/quartz/bootstrap-cli.mjs @@ -247,7 +247,7 @@ See the [documentation](https://quartz.jzhao.xyz) for how to get started. console.log( "Pulling updates... you may need to resolve some `git` conflicts if you've made changes to components or plugins.", ) - spawnSync("git", ["rebase", UPSTREAM_NAME, QUARTZ_SOURCE_BRANCH], { stdio: "inherit" }) + spawnSync("git", ["pull", "--rebase", "--autostash", UPSTREAM_NAME, QUARTZ_SOURCE_BRANCH], { stdio: "inherit" }) await popContentFolder(contentFolder) console.log("Ensuring dependencies are up to date") spawnSync("npm", ["i"], { stdio: "inherit" }) @@ -272,7 +272,7 @@ See the [documentation](https://quartz.jzhao.xyz) for how to get started. console.log( "Pulling updates from your repository. You may need to resolve some `git` conflicts if you've made changes to components or plugins.", ) - spawnSync("git", ["rebase", "origin", QUARTZ_SOURCE_BRANCH], { stdio: "inherit" }) + spawnSync("git", ["pull", "--rebase", "--autostash", "origin", QUARTZ_SOURCE_BRANCH], { stdio: "inherit" }) } await popContentFolder(contentFolder)