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

Cleanup controller config (backport #180) #181

Merged
merged 2 commits into from
Sep 7, 2023
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 7, 2023

This is an automatic backport of pull request #180 done by Mergify.
Cherry-pick of 2231745 has failed:

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

You are currently cherry-picking commit 2231745.
  (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:   ign_ros2_control_demos/config/cartpole_controller_effort.yaml
	modified:   ign_ros2_control_demos/config/cartpole_controller_velocity.yaml
	modified:   ign_ros2_control_demos/examples/example_effort.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ign_ros2_control_demos/launch/cart_example_effort.launch.py

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

Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
(cherry picked from commit 2231745)

# Conflicts:
#	ign_ros2_control_demos/launch/cart_example_effort.launch.py
@mergify mergify bot requested a review from ahcorde as a code owner September 7, 2023 10:51
@mergify mergify bot added the conflicts label Sep 7, 2023
@mergify mergify bot mentioned this pull request Sep 7, 2023
Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
@ahcorde ahcorde merged commit 889837d into humble Sep 7, 2023
3 checks passed
@ahcorde ahcorde deleted the mergify/bp/humble/pr-180 branch September 7, 2023 11:04
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.

None yet

1 participant