Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add a dependency (partial backport #305) #306

Merged
merged 4 commits into from
Aug 17, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 17, 2023

This is an automatic backport of pull request #305 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

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 <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@christophfroehlich
Copy link
Contributor

Needs ros-controls/ros2_control#1052 to be merged first

@christophfroehlich christophfroehlich marked this pull request as draft June 17, 2023 08:50
@mergify mergify bot deleted the mergify/bp/humble/pr-305 branch June 18, 2023 08:06
@christophfroehlich christophfroehlich restored the mergify/bp/humble/pr-305 branch August 17, 2023 06:53
@christophfroehlich
Copy link
Contributor

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Aug 17, 2023

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/1)
Auto-merging example_1/bringup/launch/rrbot.launch.py
Auto-merging example_2/bringup/launch/diffbot.launch.py
CONFLICT (modify/delete): example_3/bringup/launch/rrbot_base.launch.py deleted in HEAD and modified in 484d2cc (add a dependency; fix deprecation warning (#305)).  Version 484d2cc (add a dependency; fix deprecation warning (#305)) of example_3/bringup/launch/rrbot_base.launch.py left in tree.
CONFLICT (modify/delete): example_4/bringup/launch/rrbot_base.launch.py deleted in HEAD and modified in 484d2cc (add a dependency; fix deprecation warning (#305)).  Version 484d2cc (add a dependency; fix deprecation warning (#305)) of example_4/bringup/launch/rrbot_base.launch.py left in tree.
CONFLICT (modify/delete): example_5/bringup/launch/rrbot_base.launch.py deleted in HEAD and modified in 484d2cc (add a dependency; fix deprecation warning (#305)).  Version 484d2cc (add a dependency; fix deprecation warning (#305)) of example_5/bringup/launch/rrbot_base.launch.py left in tree.
CONFLICT (modify/delete): example_6/bringup/launch/rrbot_base.launch.py deleted in HEAD and modified in 484d2cc (add a dependency; fix deprecation warning (#305)).  Version 484d2cc (add a dependency; fix deprecation warning (#305)) of example_6/bringup/launch/rrbot_base.launch.py left in tree.
CONFLICT (modify/delete): example_8/bringup/launch/rrbot_base.launch.py deleted in HEAD and modified in 484d2cc (add a dependency; fix deprecation warning (#305)).  Version 484d2cc (add a dependency; fix deprecation warning (#305)) of example_8/bringup/launch/rrbot_base.launch.py left in tree.
error: could not apply 484d2cc... add a dependency; fix deprecation warning (#305)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 484d2cc... add a dependency; fix deprecation warning (#305)

err-code: 1A8CD

@christophfroehlich christophfroehlich changed the title add a dependency; fix deprecation warning (backport #305) add a dependency (partial backport #305) Aug 17, 2023
@christophfroehlich christophfroehlich marked this pull request as ready for review August 17, 2023 07:10
@christophfroehlich christophfroehlich merged commit 8bf64ea into humble Aug 17, 2023
12 of 13 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-305 branch August 17, 2023 08:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants