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 connext references (bp #1266) #1281

Merged
merged 1 commit into from
Mar 29, 2021
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 29, 2021

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

Cherry-pick of 1467f03 has failed:

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

You are currently cherry-picking commit 1467f03.
  (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:   source/Concepts/About-Internal-Interfaces.rst
	modified:   source/Concepts/About-Middleware-Implementations.rst
	modified:   source/Contributing/Developer-Guide.rst
	modified:   source/Feature-Ideas.rst
	modified:   source/Features.rst
	modified:   source/Tutorials/Building-ROS-2-on-Linux-with-Eclipse-Oxygen.rst
	modified:   source/Tutorials/Quality-of-Service.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   source/Concepts/About-Different-Middleware-Vendors.rst
	both modified:   source/Guides/Working-with-multiple-RMW-implementations.rst
	both modified:   source/Installation/Linux-Install-Binary.rst

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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.io/

@mergify mergify bot added the conflicts label Mar 29, 2021
@mjcarroll mjcarroll had a problem deploying to ros2-documentation-pr-1281 March 29, 2021 21:46 Failure
Signed-off-by: Chris Lalancette <[email protected]>
(cherry picked from commit bf183cc)
@clalancette clalancette force-pushed the mergify/bp/dashing/pr-1266 branch from f44c238 to add0aae Compare March 29, 2021 21:46
@mjcarroll mjcarroll had a problem deploying to ros2-documentation-pr-1281 March 29, 2021 21:46 Failure
@clalancette clalancette merged commit 6f9de61 into dashing Mar 29, 2021
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/dashing/pr-1266 branch March 29, 2021 21:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants