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 typo in getting started C++ section (backport #1002) #1006

Merged
merged 2 commits into from
Dec 24, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 24, 2024

Description

This PR deletes the section 1.3.6.1 in FastDDS, which was made unnecessary after an update on the CMakeLists.txt and referred to the wrong code afterwards.

@Mergifyio backport 3.1.x 3.0.x 2.14.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • N/A Code snippets related to the added documentation have been provided.
  • Documentation tests pass locally.
  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • CI passes without warnings or errors.

This is an automatic backport of pull request #1002 done by [Mergify](https://mergify.com).

* Hotfix: deleted a section that is no longer needed

Signed-off-by: Juanjo Garcia <[email protected]>

* Hotfix: solved the failure of the CI

Signed-off-by: Juanjo Garcia <[email protected]>

---------

Signed-off-by: Juanjo Garcia <[email protected]>
(cherry picked from commit 5815f2d)

# Conflicts:
#	docs/fastdds/getting_started/simple_app/includes/dataType.rst
@mergify mergify bot added the conflicts label Dec 24, 2024
Copy link
Author

mergify bot commented Dec 24, 2024

Cherry-pick of 5815f2d has failed:

On branch mergify/bp/2.14.x/pr-1002
Your branch is up to date with 'origin/2.14.x'.

You are currently cherry-picking commit 5815f2d.
  (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:   docs/fastdds/getting_started/simple_app/includes/dataType.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 mentioned this pull request Dec 24, 2024
7 tasks
@juanjo4936 juanjo4936 added this to the v2.14.5 milestone Dec 24, 2024
Signed-off-by: Juanjo Garcia <[email protected]>
@juanjo4936 juanjo4936 requested review from richiprosima and removed request for richiprosima December 24, 2024 13:34
Copy link
Contributor

@juanjo4936 juanjo4936 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@juanlofer-eprosima juanlofer-eprosima merged commit f702b0b into 2.14.x Dec 24, 2024
4 of 5 checks passed
@juanlofer-eprosima juanlofer-eprosima deleted the mergify/bp/2.14.x/pr-1002 branch December 24, 2024 14:14
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