Browse Source

fix: add git pull strategy

Nicolas Meienberger 1 year ago
parent
commit
ed0b10c5dc
1 changed files with 7 additions and 0 deletions
  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 ------------------`);