use autostash and pull
This commit is contained in:
parent
94e0088c01
commit
0a217c1bcc
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user