This is an automatic backport of pull request #146 done by Mergify.
Cherry-pick of b7d409f3d2778c6b5d5dd086893888d3f8357308 has failed:
On branch mergify/bp/iron/pr-146
Your branch is up to date with 'origin/iron'.
You are currently cherry-picking commit b7d409f.
(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: theora_image_transport/src/theora_publisher.cpp
both modified: theora_image_transport/src/theora_subscriber.cpp
no changes added to commit (use "git add" and/or "git commit -a")
Cherry-pick of ecf8f7ea4e979ee7e6930bee66da551003d323a0 has failed:
On branch mergify/bp/iron/pr-146
Your branch is ahead of 'origin/iron' by 1 commit.
(use "git push" to publish your local commits)
You are currently cherry-picking commit ecf8f7e.
(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: theora_image_transport/src/theora_publisher.cpp
both modified: theora_image_transport/src/theora_subscriber.cpp
no changes added to commit (use "git add" and/or "git commit -a")
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 ` will backport this PR on `` branch
Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can:
- look at your merge queues
- generate the Mergify configuration with the config editor.
Finally, you can contact us on https://mergify.com
This is an automatic backport of pull request #146 done by Mergify. Cherry-pick of b7d409f3d2778c6b5d5dd086893888d3f8357308 has failed:
Cherry-pick of ecf8f7ea4e979ee7e6930bee66da551003d323a0 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/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