diff --git a/src/backport.ts b/src/backport.ts index 6419aea..ab474e0 100644 --- 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 index 0995500..c1d60d4 100644 --- a/xo.config.cjs +++ b/xo.config.cjs @@ -48,7 +48,6 @@ module.exports = { "newlines-between": "never", }, ], - "no-console": "error", "object-shorthand": [ "error", "always",