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

Fixed typos (backport #692) #693

Open
wants to merge 2 commits into
base: humble
Choose a base branch
from
Open

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 24, 2023

This is an automatic backport of pull request #692 done by Mergify.
Cherry-pick of 2a84352 has failed:

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

You are currently cherry-picking commit 2a84352.
  (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:   launch/launch/actions/execute_process.py
	modified:   launch/launch/descriptions/executable.py
	modified:   launch/launch/event_handlers/on_action_event_base.py
	modified:   launch/launch/frontend/expose.py
	modified:   launch/launch/frontend/parser.py
	modified:   launch/launch/launch_description.py
	modified:   launch/launch/substitutions/environment_variable.py
	modified:   launch/launch/utilities/__init__.py
	modified:   launch/test/launch/frontend/test_expose_decorators.py
	modified:   launch/test/launch/test_launch_description.py
	modified:   launch/test/launch/utilities/test_class_tools.py
	modified:   launch/test/launch/utilities/test_ensure_argument_type.py
	modified:   launch_pytest/README.md
	modified:   launch_testing/README.md
	modified:   launch_testing/launch_testing/asserts/assert_sequential_output.py
	modified:   launch_testing/test/launch_testing/examples/context_launch_test.py
	modified:   launch_testing/test/launch_testing/test_sequential_output_checker.py
	modified:   launch_xml/launch_xml/entity.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   launch/launch/substitutions/python_expression.py

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

@mergify mergify bot added the conflicts label Feb 24, 2023
@mergify mergify bot mentioned this pull request Feb 24, 2023
@adityapande-1995
Copy link
Contributor

@osrf-jenkins retest this please

ahcorde and others added 2 commits August 3, 2023 19:05
* Fixed typos
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
(cherry picked from commit 2a84352)

# Conflicts:
#	launch/launch/substitutions/python_expression.py
Signed-off-by: Aditya Pande <[email protected]>
Signed-off-by: Aditya Pande <[email protected]>
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