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 ros_gz_bridge as dependency to demos (backport #256) #257

Merged
merged 2 commits into from
Mar 21, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 21, 2024

While building from source, rosdep does not install ros_gz_bridge otherwise.


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

(cherry picked from commit b35100d)

# Conflicts:
#	ign_ros2_control_demos/package.xml
Copy link
Contributor Author

mergify bot commented Mar 21, 2024

Cherry-pick of b35100d has failed:

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

You are currently cherry-picking commit b35100d.
  (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:   ign_ros2_control_demos/package.xml

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested a review from ahcorde as a code owner March 21, 2024 08:33
@mergify mergify bot added the conflicts label Mar 21, 2024
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
@ahcorde ahcorde merged commit 8439124 into humble Mar 21, 2024
4 checks passed
@ahcorde ahcorde deleted the mergify/bp/humble/pr-256 branch March 21, 2024 08:42
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