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

[tricycle] Rename variable in launch file (backport #327) #337

Merged
merged 4 commits into from
Jun 10, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 10, 2024

Fix the variable name, possibly from some copy-pasting.


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

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
(cherry picked from commit cd0b002)

# Conflicts:
#	gz_ros2_control_demos/launch/tricycle_drive_example.launch.py
@mergify mergify bot added the conflicts label Jun 10, 2024
@mergify mergify bot requested a review from ahcorde as a code owner June 10, 2024 08:06
Copy link
Contributor Author

mergify bot commented Jun 10, 2024

Cherry-pick of cd0b002 has failed:

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

You are currently cherry-picking commit cd0b002.
  (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:   gz_ros2_control_demos/launch/tricycle_drive_example.launch.py

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

@ahcorde ahcorde merged commit bffe118 into iron Jun 10, 2024
6 checks passed
@ahcorde ahcorde deleted the mergify/bp/iron/pr-327 branch June 10, 2024 11:09
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