ff only

lingodotdev · Oct 7, 2024 · f74f5d8 · f74f5d8
1 parent cb75925
commit f74f5d8
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/action/src/index.ts b/action/src/index.ts
@@ -68,7 +68,11 @@ import doStuff from './do-stuff.js';
 
         ora.start('Rebasing latest changes from current branch');
         execSync(`git fetch origin ${config.currentBranchName}`);
-        execSync(`git rebase ${config.currentBranchName} ${prBranchName}`, { stdio: 'inherit' });
+        // try to fast forward rebase
+        execSync(
+          `git rebase ${config.currentBranchName} ${prBranchName} --ff-only`,
+          { stdio: 'inherit' },
+        );
         ora.succeed('Rebased latest changes from current branch');
       } else {
         ora.info(`Branch ${prBranchName} does not exist, creating`);