Skip to content

Update docs (backport #692) - #694

Merged
ahcorde merged 3 commits into
humblefrom
mergify/bp/humble/pr-692
Sep 29, 2025
Merged

Update docs (backport #692)#694
ahcorde merged 3 commits into
humblefrom
mergify/bp/humble/pr-692

Conversation

@mergify

@mergify mergify Bot commented Sep 29, 2025

Copy link
Copy Markdown
Contributor

IMHO, the section Default gz_ros2_control Behavior is completely wrong. Without a plugin tag, nothing will be started.

And I reformatted the URDF/SDF parts to use tabs.


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

(cherry picked from commit 1f191aa)

# Conflicts:
#	doc/index.rst
@mergify

mergify Bot commented Sep 29, 2025

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 1f191aa has failed:

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

You are currently cherry-picking commit 1f191aa.
  (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:   doc/index.rst

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

@mergify mergify Bot added the conflicts label Sep 29, 2025
@mergify
mergify Bot requested a review from ahcorde as a code owner September 29, 2025 07:37
@mergify mergify Bot mentioned this pull request Sep 29, 2025
Comment thread doc/index.rst Outdated
@ahcorde
ahcorde merged commit d48af38 into humble Sep 29, 2025
9 checks passed
@ahcorde
ahcorde deleted the mergify/bp/humble/pr-692 branch September 29, 2025 10:24
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