From f74f5d8580ffcfecaeafb1f89b412a4e2fa53438 Mon Sep 17 00:00:00 2001
From: maxprilutskiy <maks.prilutskiy@gmail.com>
Date: Sun, 6 Oct 2024 19:10:18 -0700
Subject: [PATCH] ff only

---
 action/src/index.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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