Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Oct 17, 2022

This is an automatic backport of pull request #3102 done by Mergify.
Cherry-pick of 1d24955 has failed:

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

You are currently cherry-picking commit 1d24955.
  (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/rm <file>..." as appropriate to mark resolution)
	deleted by us:   source/Tutorials/Intermediate/Monitoring-For-Parameter-Changes-CPP.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/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

Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
(cherry picked from commit 1d24955)

# Conflicts:
#	source/Tutorials/Intermediate/Monitoring-For-Parameter-Changes-CPP.rst
@mergify mergify bot added the conflicts label Oct 17, 2022
@clalancette
Copy link
Contributor

Closing this one, as it doesn't seem to be available for Foxy.

@clalancette clalancette deleted the mergify/bp/foxy/pr-3102 branch October 17, 2022 18:08
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.

2 participants