Fixing filestoskip option after merge

Signed-off-by: Vacha Shah <[email protected]>
VachaShah · Oct 27, 2022 · b3df18d · b3df18d
1 parent a1d89dc
commit b3df18d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);
     }