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

Let sphinx add parameter description with nested structures to documentation (backport #652) #1005

Merged
merged 2 commits into from
Feb 19, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 31, 2024

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

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

You are currently cherry-picking commit f375c69.
  (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:   admittance_controller/doc/userdoc.rst
	new file:   diff_drive_controller/doc/parameters_context.yaml
	modified:   diff_drive_controller/doc/userdoc.rst
	new file:   force_torque_sensor_broadcaster/doc/parameters_context.yaml
	modified:   force_torque_sensor_broadcaster/doc/userdoc.rst
	modified:   force_torque_sensor_broadcaster/src/force_torque_sensor_broadcaster_parameters.yaml
	modified:   gripper_controllers/doc/userdoc.rst
	modified:   imu_sensor_broadcaster/doc/userdoc.rst
	new file:   joint_state_broadcaster/doc/joint_state_broadcaster_parameter_context.yml
	modified:   joint_state_broadcaster/doc/userdoc.rst
	modified:   joint_state_broadcaster/src/joint_state_broadcaster_parameters.yaml
	new file:   joint_trajectory_controller/doc/parameters_context.yaml
	modified:   joint_trajectory_controller/src/joint_trajectory_controller_parameters.yaml
	modified:   range_sensor_broadcaster/doc/userdoc.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   joint_trajectory_controller/doc/parameters.rst

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 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

…ntation (#652)

(cherry picked from commit f375c69)

# Conflicts:
#	joint_trajectory_controller/doc/parameters.rst
@mergify mergify bot added the conflicts label Jan 31, 2024
@christophfroehlich
Copy link
Contributor

RHEL should be fixed with #1045, the binary builds fail because of hardware_interface_testing not being released?

@bmagyar bmagyar merged commit 0cfe23e into humble Feb 19, 2024
9 of 14 checks passed
@bmagyar bmagyar deleted the mergify/bp/humble/pr-652 branch February 19, 2024 18:22
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.

2 participants