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 a typo in Writing-A-Simple-Cpp-Service-And-Client.rst (backport #4934) #4937

Merged
merged 2 commits into from
Jan 14, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 14, 2025

The currently code shows error when the result is success.


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

Signed-off-by: Jihye Sofia Seo <[email protected]>
(cherry picked from commit 3959d21)

# Conflicts:
#	source/Tutorials/Beginner-Client-Libraries/Writing-A-Simple-Cpp-Service-And-Client.rst
Copy link
Contributor Author

mergify bot commented Jan 14, 2025

Cherry-pick of 3959d21 has failed:

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

You are currently cherry-picking commit 3959d21.
  (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:   source/Tutorials/Beginner-Client-Libraries/Writing-A-Simple-Cpp-Service-And-Client.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 Jan 14, 2025
@mergify mergify bot requested review from clalancette and audrow as code owners January 14, 2025 09:06
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
Copy link

HTML artifacts: https://github.com/ros2/ros2_documentation/actions/runs/12764683589/artifacts/2427090149.

To view the resulting site:

  1. Click on the above link to download the artifacts archive
  2. Extract it
  3. Open html-artifacts-4937/index.html in your favorite browser

@ahcorde ahcorde merged commit d1dc653 into jazzy Jan 14, 2025
4 checks passed
@ahcorde ahcorde deleted the mergify/bp/jazzy/pr-4934 branch January 14, 2025 09:36
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