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

Fix crash for missing urdf in resource manager (backport #1301) #1312

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 17, 2024

This is an automatic backport of pull request #1301 done by Mergify.
Cherry-pick of 510ba73 has failed:

On branch mergify/bp/humble/pr-1301
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 510ba73.
  (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:   hardware_interface/include/hardware_interface/resource_manager.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hardware_interface/src/resource_manager.cpp

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.

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

* check the components size instead of the variable (fixes #1299)
* add new load_and_initialize_components default argument to the load_urdf method

(cherry picked from commit 510ba73)

# Conflicts:
#	hardware_interface/src/resource_manager.cpp
@mergify mergify bot added the conflicts label Jan 17, 2024
@saikishor
Copy link
Member

I fixed the conflicts of the humble PR in a new PR : #1316

@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-1301 branch January 18, 2024 12:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants