mergify[bot]
commented
8 months ago Cherry-pick of b89277a81cd0b8ebb9745e21908ef31b83e7fea8 has failed:
On branch mergify/bp/version-14-hotfix/pr-405
Your branch is up to date with 'origin/version-14-hotfix'.
You are currently cherry-picking commit b89277a.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: healthcare/healthcare/doctype/clinical_procedure/clinical_procedure.js
no changes added to commit (use "git add" and/or "git commit -a")To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
This is an automatic backport of pull request #405 done by Mergify. Cherry-pick of b89277a81cd0b8ebb9745e21908ef31b83e7fea8 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the [documentation](https://docs.mergify.com/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport