diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js index 18ccef884a9..2d973599343 100644 --- a/build/npm/postinstall.js +++ b/build/npm/postinstall.js @@ -88,4 +88,4 @@ runtime "${runtime}"`; yarnInstall(watchPath); } -cp.execSync('git config pull.rebase true'); +cp.execSync('git config pull.rebase merges');