Hello @smarbo, 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.
No worries! You can follow this guide 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.
If you have any questions or need further assistance, don't hesitate to reach out. We're here to help!
Hello @smarbo, 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.
No worries! You can follow this guide 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.
If you have any questions or need further assistance, don't hesitate to reach out. We're here to help!