Explorar el Código

fix: add git pull strategy

Nicolas Meienberger hace 1 año
padre
commit
a59da9cfc2
Se han modificado 1 ficheros con 7 adiciones y 0 borrados
  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}`);
         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
       // reset hard
       await execAsync(`git -C ${repoPath} reset --hard`).then(({ stdout, stderr }) => {
       await execAsync(`git -C ${repoPath} reset --hard`).then(({ stdout, stderr }) => {
         this.logger.info(`------------------ git -C ${repoPath} reset --hard ------------------`);
         this.logger.info(`------------------ git -C ${repoPath} reset --hard ------------------`);