Retry post error for filtering out files

Signed-off-by: Kunal Kotwani <[email protected]>
VachaShah · Oct 28, 2022 · a2dbadb · a2dbadb
1 parent 78b763d
commit a2dbadb
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/backport.ts b/src/backport.ts
@@ -105,7 +105,12 @@ 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) {
+			core.error("Possibly a conflict error. Trying to skip possible conflict files. ")
+		  }
+
     for (const file of filesToSkip) {
       await git("checkout", "HEAD", file);
     }