Skip to content

Commit

Permalink
Log forward-merger error (#180)
Browse files Browse the repository at this point in the history
  • Loading branch information
AyodeAwe authored Mar 19, 2024
1 parent 4413ab2 commit f5ed9b5
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/plugins/ForwardMerger/forward_merger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down

0 comments on commit f5ed9b5

Please sign in to comment.