Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Dec 16, 2024

This commit updates the package maintainers as the project's governance has changed a bit.


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

@mergify mergify bot added conflicts humble Relevant for humble and higher ROS versions labels Dec 16, 2024
@mergify
Copy link
Author

mergify bot commented Dec 16, 2024

Cherry-pick of 0f80235 has failed:

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

You are currently cherry-picking commit 0f80235.
  (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:   ur/package.xml
	both modified:   ur_calibration/package.xml
	both modified:   ur_controllers/package.xml
	both modified:   ur_dashboard_msgs/package.xml
	both modified:   ur_moveit_config/package.xml
	both modified:   ur_robot_driver/package.xml

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

This commit updates the package maintainers as the project's governance has changed a bit.
@urfeex urfeex force-pushed the mergify/bp/humble/pr-1203 branch from 8bd7169 to 2088881 Compare December 16, 2024 13:04
@urfeex urfeex removed the conflicts label Dec 16, 2024
@urfeex urfeex merged commit c1f75d4 into humble Dec 16, 2024
6 checks passed
@urfeex urfeex deleted the mergify/bp/humble/pr-1203 branch December 16, 2024 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

humble Relevant for humble and higher ROS versions

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants