From f5ed9b5d68633efc122202c36620f56a4c5ecf2b Mon Sep 17 00:00:00 2001 From: Jake Awe <50372925+AyodeAwe@users.noreply.github.com> Date: Tue, 19 Mar 2024 12:25:18 -0500 Subject: [PATCH] Log forward-merger error (#180) --- src/plugins/ForwardMerger/forward_merger.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/ForwardMerger/forward_merger.ts b/src/plugins/ForwardMerger/forward_merger.ts index 3541ac7..70fe574 100644 --- a/src/plugins/ForwardMerger/forward_merger.ts +++ b/src/plugins/ForwardMerger/forward_merger.ts @@ -68,6 +68,7 @@ export class ForwardMerger extends OpsBotPlugin { sha: pr.head.sha, }); } catch (error) { + this.logger.info(`Error during forward-merge: ${JSON.stringify(error)}`) await this.issueComment( pr.number, "**FAILURE** - Unable to forward-merge due to an error, **manual** merge is necessary. Do not use the `Resolve conflicts` option in this PR, follow these instructions https://docs.rapids.ai/maintainers/forward-merger/ \n\n**IMPORTANT**: When merging this PR, do not use the [auto-merger](https://docs.rapids.ai/resources/auto-merger/) (i.e. the `/merge` comment). Instead, an admin must manually merge by changing the merging strategy to `Create a Merge Commit`. Otherwise, history will be lost and the branches become incompatible."