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/stats (backport #363) #393

Merged
merged 3 commits into from
Jan 29, 2025
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 29, 2025

Minor change to a deprecated method and update renamed branch of gz_ros2_control


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

* Fix deprecated method and gz branch

* Cleanup comments

* Update comments

* Add missing include

(cherry picked from commit 99271f8)

# Conflicts:
#	make_help_scripts/deploy_defines.py
@mergify mergify bot added the conflicts label Jan 29, 2025
Copy link
Contributor Author

mergify bot commented Jan 29, 2025

Cherry-pick of 99271f8 has failed:

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

You are currently cherry-picking commit 99271f8.
  (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:   make_help_scripts/create_pr_stats.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   make_help_scripts/deploy_defines.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 mentioned this pull request Jan 29, 2025
@christophfroehlich christophfroehlich merged commit 908cca5 into jazzy Jan 29, 2025
4 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/jazzy/pr-363 branch January 29, 2025 18:06
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