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

Backport of Remove recommendation for Cyclone due to FastDDS issues (#799) to humble #805

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

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 30, 2023

This is an automatic backport of pull request #799 done by Mergify.
Cherry-pick of 71ee840 has failed:

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

You are currently cherry-picking commit 71ee840.
  (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:   .docker/Dockerfile

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   doc/tutorials/getting_started/getting_started.rst
	both modified:   doc/tutorials/quickstart_in_rviz/quickstart_in_rviz_tutorial.rst

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

* Remove recommendation for Cyclone due to FastDDS issues

* Remove cyclone config from Dockerfile

(cherry picked from commit 71ee840)

# Conflicts:
#	doc/tutorials/getting_started/getting_started.rst
#	doc/tutorials/quickstart_in_rviz/quickstart_in_rviz_tutorial.rst
@mergify mergify bot added conflicts humble Humble branch labels Oct 30, 2023
Copy link
Author

mergify bot commented Jan 26, 2024

This pull request is in conflict. Could you fix it @mergify[bot]?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts humble Humble branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants