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

Docs: Use branch name substitution for all links (backport #1031) #1042

Merged
merged 2 commits into from
May 31, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 30, 2023

This is an automatic backport of pull request #1031 done by Mergify.
Cherry-pick of 590de4e has failed:

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

You are currently cherry-picking commit 590de4e.
  (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:   controller_manager/doc/userdoc.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   doc/index.rst
	both modified:   hardware_interface/doc/hardware_components_userdoc.rst
	both modified:   hardware_interface/doc/mock_components_userdoc.rst
	both modified:   hardware_interface/doc/writing_new_hardware_interface.rst
	both modified:   ros2controlcli/doc/userdoc.rst

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

(cherry picked from commit 590de4e)

# Conflicts:
#	doc/index.rst
#	hardware_interface/doc/hardware_components_userdoc.rst
#	hardware_interface/doc/mock_components_userdoc.rst
#	hardware_interface/doc/writing_new_hardware_interface.rst
#	ros2controlcli/doc/userdoc.rst
@bmagyar bmagyar merged commit 297159d into humble May 31, 2023
@mergify mergify bot deleted the mergify/bp/humble/pr-1031 branch May 31, 2023 07:09
flochre pushed a commit to flochre/ros2_control that referenced this pull request Jul 5, 2023
…ls#1031) (ros-controls#1042)

* Docs: Use branch name substitution for all links (ros-controls#1031)

(cherry picked from commit 590de4e)

# Conflicts:
#	doc/index.rst
#	hardware_interface/doc/hardware_components_userdoc.rst
#	hardware_interface/doc/mock_components_userdoc.rst
#	hardware_interface/doc/writing_new_hardware_interface.rst
#	ros2controlcli/doc/userdoc.rst

* Fix merge conflicts (ros-controls#1043)

---------

Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
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