ros-sports / soccer_interfaces

A set of packages which contain common soccer interface files
Apache License 2.0
8 stars 3 forks source link

3d vision msgs (backport #22) #34

Closed mergify[bot] closed 2 years ago

mergify[bot] commented 2 years ago

This is an automatic backport of pull request #22 done by Mergify. Cherry-pick of 874aab5631955bf0bab4b1eda41ef44a70001f3a has failed:

On branch mergify/bp/galactic/pr-22
Your branch is ahead of 'origin/galactic' by 9 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 874aab5.
  (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:   soccer_2d_vision_msgs/msg/MarkingArray.msg
    modified:   soccer_2d_vision_msgs/msg/MarkingEllipse.msg
    modified:   soccer_2d_vision_msgs/msg/Obstacle.msg
    modified:   soccer_2d_vision_msgs/msg/ObstacleArray.msg
    modified:   soccer_3d_vision_msgs/CMakeLists.txt
    new file:   soccer_3d_vision_msgs/msg/MarkingArray.msg
    new file:   soccer_3d_vision_msgs/msg/MarkingEllipse.msg
    new file:   soccer_3d_vision_msgs/msg/MarkingIntersection.msg
    new file:   soccer_3d_vision_msgs/msg/MarkingSegment.msg
    new file:   soccer_3d_vision_msgs/msg/Obstacle.msg
    new file:   soccer_3d_vision_msgs/msg/ObstacleArray.msg

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   soccer_2d_vision_msgs/msg/MarkingIntersection.msg

Cherry-pick of e7a5a23625fdb30af5f3a6bf181e4638dbca3a78 has failed:

On branch mergify/bp/galactic/pr-22
Your branch is ahead of 'origin/galactic' by 10 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit e7a5a23.
  (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:   soccer_3d_vision_msgs/CMakeLists.txt
    new file:   soccer_3d_vision_msgs/msg/Robot.msg
    new file:   soccer_vision_attribute_msgs/msg/Robot.msg

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   soccer_2d_vision_msgs/msg/Robot.msg

Cherry-pick of a1b7b2b2bdffe93e14cd162e346ee3cc9294cc22 has failed:

On branch mergify/bp/galactic/pr-22
Your branch is ahead of 'origin/galactic' by 29 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit a1b7b2b.
  (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:   README.md

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/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 ` 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