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

Use tf prefix properly (backport #688) #725

Merged
merged 2 commits into from
Jun 23, 2023
Merged

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 23, 2023

This is an automatic backport of pull request #688 done by Mergify.
Cherry-pick of 7cda9c1 has failed:

On branch mergify/bp/humble/pr-688
Your branch is ahead of 'origin/humble' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 7cda9c1.
  (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:   Universal_Robots_ROS2_Driver-not-released.humble.repos

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   Universal_Robots_ROS2_Driver-not-released.rolling.repos

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

ros2_control can now accept empty parameters, so this isn't needed anymore.

(cherry picked from commit ac1c550)
@mergify mergify bot added the conflicts label Jun 23, 2023
@mergify mergify bot mentioned this pull request Jun 23, 2023
Copy link
Collaborator

@fmauch fmauch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested locally with a modified controllers.yaml and it seems to be working fine with a tf_prefix on humble.

@fmauch fmauch merged commit 7014d93 into humble Jun 23, 2023
@fmauch fmauch deleted the mergify/bp/humble/pr-688 branch June 23, 2023 07:08
@fmauch fmauch mentioned this pull request Jun 26, 2023
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