Skip to content

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 2, 2022

This is an automatic backport of pull request #405 done by Mergify.
Cherry-pick of d71d784 has failed:

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

You are currently cherry-picking commit d71d784.
  (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:   doc/how_to_contribute/how_to_write_tutorials.rst
	modified:   doc/tutorials/getting_started/getting_started.rst
	modified:   doc/tutorials/quickstart_in_rviz/quickstart_in_rviz_tutorial.rst
	modified:   doc/tutorials/visualizing_in_rviz/visualizing_in_rviz.rst
	modified:   doc/tutorials/your_first_project/your_first_project.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   README.md

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 Jun 2, 2022
* Improve wording in Getting Started and other tutorials

* Fixup

* Improve README

* Address PR feedback

(cherry picked from commit d71d784)
@davetcoleman davetcoleman force-pushed the mergify/bp/humble/pr-405 branch from 3d4ff4c to 7f65302 Compare June 2, 2022 19:15
@davetcoleman davetcoleman merged commit 3477a55 into humble Jun 2, 2022
@davetcoleman davetcoleman deleted the mergify/bp/humble/pr-405 branch June 2, 2022 20:02
@tylerjw tylerjw mentioned this pull request Feb 21, 2023
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.

1 participant