ff

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