Closed mergify[bot] closed 6 months ago
Cherry-pick of 944843d5aa146465bf29c3b25c7ca108b417907c has failed:
On branch mergify/bp/iron/pr-687
Your branch is up to date with 'origin/iron'.
You are currently cherry-picking commit 944843d.
(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)
Changes to be committed:
modified: .github/workflows/ci.yml
modified: .github/workflows/nightly.yml
modified: package.xml
modified: scripts/create_firmware_ws.sh
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: config/host/generic/client_host_packages.repos
both modified: scripts/create_ws.sh
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 #687 done by Mergify. Cherry-pick of 944843d5aa146465bf29c3b25c7ca108b417907c 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