瀏覽代碼

fix: add git pull strategy

Nicolas Meienberger 1 年之前
父節點
當前提交
ed0b10c5dc
共有 1 個文件被更改,包括 7 次插入0 次删除
  1. 7 0
      packages/cli/src/executors/repo/repo.executors.ts

+ 7 - 0
packages/cli/src/executors/repo/repo.executors.ts

@@ -81,6 +81,13 @@ export class RepoExecutors {
         this.logger.info(`stdout: ${stdout}`);
       });
 
+      // git config pull.rebase false
+      await execAsync(`git -C ${repoPath} config pull.rebase false`).then(({ stdout, stderr }) => {
+        this.logger.info(`------------------ git -C ${repoPath} config pull.rebase false ------------------`);
+        this.logger.error(`stderr: ${stderr}`);
+        this.logger.info(`stdout: ${stdout}`);
+      });
+
       // reset hard
       await execAsync(`git -C ${repoPath} reset --hard`).then(({ stdout, stderr }) => {
         this.logger.info(`------------------ git -C ${repoPath} reset --hard ------------------`);