keroosha/keroosha.cybergulag.today
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

use autostash and pull

Browse source
This commit is contained in:
Jacky Zhao 2023-08-02 22:16:32 -07:00
parent 558a509164
commit 5537ca41e0
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
quartz/bootstrap-cli.mjs
View file

@ -247,7 +247,7 @@ See the [documentation](https://quartz.jzhao.xyz) for how to get started.
console.log( console.log(
"Pulling updates... you may need to resolve some `git` conflicts if you've made changes to components or plugins.", "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) await popContentFolder(contentFolder)
console.log("Ensuring dependencies are up to date") console.log("Ensuring dependencies are up to date")
spawnSync("npm", ["i"], { stdio: "inherit" }) spawnSync("npm", ["i"], { stdio: "inherit" })
@ -272,7 +272,7 @@ See the [documentation](https://quartz.jzhao.xyz) for how to get started.
console.log( console.log(
"Pulling updates from your repository. You may need to resolve some `git` conflicts if you've made changes to components or plugins.", "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) await popContentFolder(contentFolder)