From 80584a45e7581ce0dfd720fd14e2e3ded224d03c Mon Sep 17 00:00:00 2001 From: Shubham Sonake <142776806+imShubh03@users.noreply.github.com> Date: Wed, 19 Feb 2025 13:51:59 +0530 Subject: [PATCH] Fix : broken link to resolving merge conflicts guide (#94372) (#94457) Co-authored-by: Roshan Jossy --- .github/workflows/auto-pr-merge.yml | 2 +- Contributors.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/auto-pr-merge.yml b/.github/workflows/auto-pr-merge.yml index 8dbc53de..0b9c2cfc 100644 --- a/.github/workflows/auto-pr-merge.yml +++ b/.github/workflows/auto-pr-merge.yml @@ -153,7 +153,7 @@ jobs: // Handle specific error cases based on status code if (error.status === 405 && error.response.data.message === "Pull Request is not mergeable") { - errMsg = `Hello @${context.payload.pull_request.user.login}, thank you for your pull request. We appreciate your contribution to the project. However, before we can merge it, there is a merge conflict with the target branch. \n\n No worries! You can follow [this guide](https://github.com/firstcontributions/first-contributions/blob/main/additional-material/git_workflow_scenarios/resolving-merge-conflicts.md) on resolving merge conflicts. + errMsg = `Hello @${context.payload.pull_request.user.login}, thank you for your pull request. We appreciate your contribution to the project. However, before we can merge it, there is a merge conflict with the target branch. \n\n No worries! You can follow [this guide](https://github.com/firstcontributions/first-contributions/blob/main/docs/additional-material/git_workflow_scenarios/resolving-merge-conflicts.md) on resolving merge conflicts. Once you've fixed the conflicts and pushed your changes, the repository will check the changes you made and proceed with the merge if everything looks good. \n\n If you have any questions or need further assistance, don't hesitate to reach out. We're here to help!` } else if (error.status === 409) { diff --git a/Contributors.md b/Contributors.md index bf314459..c9dc9478 100644 --- a/Contributors.md +++ b/Contributors.md @@ -36,6 +36,7 @@ - [Aaron Corpuz](https://github.com/acorp88) - [Thomas Hyam](https://github.com/HyamT) Lets get contributing - [Adil Köken](https://github.com/AdilKoken/) +- [Shubham Sonake](https://github.com/imShubh03) First of many - [Mike Floyd](https://github.com/kmfloyd) Hello there, and thank you for this tutorial - [Praveen Raj](https://github.com/trytobegoodatleast) - [Sarah Calixto](https://github.com/sarahcalixto)