lucasvbr/first-contributions
1
0
Fork 0
mirror of https://github.com/LucasVbr/first-contributions.git synced 2026-05-13 17:21:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix : broken link to resolving merge conflicts guide (#94372) (#94457)

Browse Source 
Co-authored-by: Roshan Jossy <roshanjossey@gmail.com>
This commit is contained in:
Shubham Sonake
2025-02-19 13:51:59 +05:30
committed by GitHub
parent 89600bed8e
commit 80584a45e7
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/auto-pr-merge.yml
+1 -1
View File
@@ -153,7 +153,7 @@ jobs:
// Handle specific error cases based on status code // Handle specific error cases based on status code
if (error.status === 405 && error.response.data.message === "Pull Request is not mergeable") { 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!` 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) { } else if (error.status === 409) {
Contributors.md
+1
View File
@@ -36,6 +36,7 @@
- [Aaron Corpuz](https://github.com/acorp88) - [Aaron Corpuz](https://github.com/acorp88)
- [Thomas Hyam](https://github.com/HyamT) Lets get contributing - [Thomas Hyam](https://github.com/HyamT) Lets get contributing
- [Adil Köken](https://github.com/AdilKoken/) - [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 - [Mike Floyd](https://github.com/kmfloyd) Hello there, and thank you for this tutorial
- [Praveen Raj](https://github.com/trytobegoodatleast) - [Praveen Raj](https://github.com/trytobegoodatleast)
- [Sarah Calixto](https://github.com/sarahcalixto) - [Sarah Calixto](https://github.com/sarahcalixto)