diff --git a/action/src/index.ts b/action/src/index.ts index 8edd32a..4094890 100644 --- 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`);