Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 5, 2022

This is an automatic backport of pull request #281 done by Mergify.
Cherry-pick of 9a8be06 has failed:

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

You are currently cherry-picking commit 9a8be06.
  (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:   diff_drive_controller/src/odometry.cpp

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

Co-authored-by: Paul Verhoeckx <paul.verhoeckx@nobleo.nl>
(cherry picked from commit 9a8be06)

# Conflicts:
#	diff_drive_controller/src/odometry.cpp
@bmagyar
Copy link
Member

bmagyar commented Jan 11, 2022

This backport doesn't apply to Foxy as the bug was not present there in the first place

@bmagyar bmagyar closed this Jan 11, 2022
@mergify mergify bot deleted the mergify/bp/foxy/pr-281 branch January 11, 2022 09:06
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