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

Migration guide from ROS Wiki to docs.ros.org (backport #4167) #4169

Merged
merged 1 commit into from
Feb 16, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 16, 2024

This is an automatic backport of pull request #4167 done by Mergify.
Cherry-pick of 8fbb74d has failed:

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

You are currently cherry-picking commit 8fbb74d.
  (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/The-ROS2-Project/Contributing/Contributing-To-ROS-2-Documentation.rst

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

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/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 requested review from clalancette and audrow as code owners February 16, 2024 14:07
@mergify mergify bot added the conflicts label Feb 16, 2024
* Migration guide.

Signed-off-by: Katherine Scott <[email protected]>
Co-authored-by: Chris Lalancette <[email protected]>
Co-authored-by: Tomoya Fujita <[email protected]>
(cherry picked from commit 8fbb74d)
@clalancette clalancette force-pushed the mergify/bp/iron/pr-4167 branch from fc5106d to d840409 Compare February 16, 2024 14:17
@clalancette clalancette merged commit fce8c93 into iron Feb 16, 2024
3 checks passed
@clalancette clalancette deleted the mergify/bp/iron/pr-4167 branch February 16, 2024 14:22
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