Fixing lint and prettier errors

Signed-off-by: Vacha Shah <vachshah@amazon.com>
VachaShah · Jun 13, 2023 · ec2ff51 · ec2ff51
1 parent dc45320
commit ec2ff51
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/backport.ts b/src/backport.ts
@@ -108,9 +108,14 @@ const backportOnce = async ({
     try {
       await git("cherry-pick", "-x", "-n", commitSha);
     } catch (error: unknown) {
-      logError(
-        "Possibly a conflict error. Trying to skip possible conflict files. ",
-      );
+      if (error instanceof Error) {
+        logError(
+          "Possibly a conflict error. Trying to skip possible conflict files. ",
+        );
+        console.log(error.message);
+      } else {
+        console.log("Unexpected error", error);
+      }
     }
 
     /* eslint-disable no-await-in-loop */
@@ -333,7 +338,7 @@ const backport = async ({
               commitSha: mergeCommitSha,
               errorMessage: error.message,
               head,
-              repo
+              repo,
             }),
             issue_number: number,
             owner,

diff --git a/xo.config.cjs b/xo.config.cjs
@@ -48,7 +48,6 @@ module.exports = {
         "newlines-between": "never",
       },
     ],
-    "no-console": "error",
     "object-shorthand": [
       "error",
       "always",