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 topic remappings (backport #565) #566

Merged
merged 3 commits into from
Aug 12, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 12, 2024

This fixes some wrong/outdated topic remappings


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

* Fix remapping for ex2

* Cleanup

* Fix remapping of ex15

(cherry picked from commit 71a86bd)

# Conflicts:
#	example_2/bringup/launch/diffbot.launch.py
#	example_7/bringup/launch/r6bot_controller.launch.py
Copy link
Contributor Author

mergify bot commented Aug 12, 2024

Cherry-pick of 71a86bd has failed:

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

You are currently cherry-picking commit 71a86bd.
  (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:   example_15/bringup/config/rrbot_namespace_forward_position_publisher.yaml
	modified:   example_15/bringup/launch/rrbot_namespace.launch.py
	modified:   example_2/doc/userdoc.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   example_2/bringup/launch/diffbot.launch.py
	both modified:   example_7/bringup/launch/r6bot_controller.launch.py

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 added the conflicts label Aug 12, 2024
@christophfroehlich christophfroehlich merged commit 70435a3 into humble Aug 12, 2024
8 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-565 branch August 12, 2024 07:28
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.

1 participant