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

Update documentation to point to new default DDS (bp #1000) #1002

Merged
merged 5 commits into from
Jan 12, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 12, 2021

This is an automated backport of pull request #1000 done by Mergify

Cherry-pick of 1edebe3 has failed:

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

You are currently cherry-picking commit 1edebe3.
  (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/Working-with-multiple-RMW-implementations.rst

no changes added to commit (use "git add" and/or "git commit -a")

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/

Signed-off-by: Chris Lalancette <[email protected]>
(cherry picked from commit 1edebe3)

# Conflicts:
#	source/Tutorials/Working-with-multiple-RMW-implementations.rst
Signed-off-by: Chris Lalancette <[email protected]>
(cherry picked from commit 22800cd)
Signed-off-by: Chris Lalancette <[email protected]>
(cherry picked from commit d944d4d)
Signed-off-by: Chris Lalancette <[email protected]>
(cherry picked from commit 9271039)
Signed-off-by: Chris Lalancette <[email protected]>
@mjcarroll mjcarroll had a problem deploying to ros2-documentation-pr-1002 January 12, 2021 15:00 Failure
@clalancette
Copy link
Contributor

Going ahead and merging this one with the conflict fixed.

@maryaB-osr
Copy link
Contributor

@clalancette This should not have created automatic backports to foxy and dashing; only one of the pages matched the "common pages" rule. Previously when I tested this case (PR with one or more common pages but also other pages), mergify didn't create backports, so I thought we were good to go. I'll have to look at the mergify rules, but this could be pretty bad/annoying if it can't be fixed :/

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.

3 participants