docs: resolve merge conflicts in launch tutorial #6091
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Remove conflict markers, keep multi-format references, and fix PushRosNamespace capitalization. Signed-off-by: Luke Sy <[email protected]>
Contributor
Author
ahcorde
approved these changes
Dec 12, 2025
mjcarroll
pushed a commit
that referenced
this pull request
Dec 12, 2025
…6021) (#6087) * Add XML/YAML launch equivalents for large project tutorial (#6021) Signed-off-by: Luke Sy <[email protected]> Signed-off-by: Katherine Scott <[email protected]> Co-authored-by: Katherine Scott <[email protected]> (cherry picked from commit 536c723) # Conflicts: # source/Tutorials/Intermediate/Launch/Using-ROS2-Launch-For-Large-Projects.rst * docs: resolve merge conflicts in launch tutorial (#6091) Remove conflict markers, keep multi-format references, and fix PushRosNamespace capitalization. Signed-off-by: Luke Sy <[email protected]> --------- Signed-off-by: Luke Sy <[email protected]> Co-authored-by: lsy3 <[email protected]> Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Resolve merge conflicts in launch tutorial from PR #6021 backport.
Did you use Generative AI?
NA
Additional Information
Resolves conflicts from mergify backport of #6021 to humble branch.