Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

Commit 2cd7684

Browse files
committed
chore: merge --strategy=theirs no longer exists
1 parent fe0f271 commit 2cd7684

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

release.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@
367367
pushCmds.push(
368368
comment('update package.json in master'),
369369
'git checkout master',
370-
`git pull --rebase ${origin} master --strategy=theirs`,
370+
`git pull --rebase ${origin} master --strategy=recursive --strategy-option==theirs`,
371371
`git checkout release/${newVersion} -- CHANGELOG.md`,
372372
`node -e "const newVersion = '${newVersion}'; ${stringifyFunction(buildCommand)}"`,
373373
'git add CHANGELOG.md',

0 commit comments

Comments
 (0)