Retry post error for filtering out files (#6)

Signed-off-by: Kunal Kotwani <[email protected]> Signed-off-by: Kunal Kotwani <[email protected]>
VachaShah · Oct 28, 2022 · a1481bf · a1481bf
1 parent 78b763d
commit a1481bf
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/backport.ts b/src/backport.ts
@@ -105,7 +105,14 @@ const backportOnce = async ({
   await git("switch", base);
   await git("switch", "--create", head);
   try {
-    await git("cherry-pick", "-x", "-n", commitSha);
+    try {
+      await git("cherry-pick", "-x", "-n", commitSha);
+    } catch (error: unknown) {
+      logError(
+        "Possibly a conflict error. Trying to skip possible conflict files. ",
+      );
+    }
+
     for (const file of filesToSkip) {
       await git("checkout", "HEAD", file);
     }