From b3df18ddcfa44fc8038e1c8a106c3fb0f07763df Mon Sep 17 00:00:00 2001
From: Vacha Shah <vachshah@amazon.com>
Date: Thu, 27 Oct 2022 05:00:40 +0000
Subject: [PATCH] Fixing filestoskip option after merge

Signed-off-by: Vacha Shah <vachshah@amazon.com>
---
 src/backport.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backport.ts b/src/backport.ts
index a47a202..a15eece 100644
--- a/src/backport.ts
+++ b/src/backport.ts
@@ -105,7 +105,7 @@ const backportOnce = async ({
   await git("switch", base);
   await git("switch", "--create", head);
   try {
-    await git("cherry-pick", "-x", commitSha);
+    await git("cherry-pick", "-x", "-n", commitSha);
     for (const file of filesToSkip) {
       await git("checkout", "HEAD", file);
     }