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

removing kinematic limiting from RPP (backport #2631) #2635

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 20, 2021

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

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

You are currently cherry-picking commit c65532f7.
  (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:   nav2_regulated_pure_pursuit_controller/include/nav2_regulated_pure_pursuit_controller/regulated_pure_pursuit_controller.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   nav2_regulated_pure_pursuit_controller/src/regulated_pure_pursuit_controller.cpp
	both modified:   nav2_regulated_pure_pursuit_controller/test/test_regulated_pp.cpp

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.io/

* removing kinematic limiting from RPP

* update tests

(cherry picked from commit c65532f)

# Conflicts:
#	nav2_regulated_pure_pursuit_controller/src/regulated_pure_pursuit_controller.cpp
#	nav2_regulated_pure_pursuit_controller/test/test_regulated_pp.cpp
@mergify mergify bot added the conflicts label Oct 20, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Oct 20, 2021

@mergify[bot], all pull requests must be targeted towards the main development branch.
Once merged into main, it is possible to backport to @galactic, but it must be in main
to have these changes reflected into new distributions.

@mergify
Copy link
Contributor Author

mergify bot commented Oct 20, 2021

@mergify[bot], please properly fill in PR template in the future. @SteveMacenski, use this instead.

  • Check that any new parameters added are updated in navigation.ros.org
  • Check that any significant change is added to the migration guide
  • Check that any new functions have Doxygen added
  • Check that any new features have test coverage
  • Check that any new plugins is added to the plugins page
  • If BT Node, Additionally: add to BT's XML index of nodes for groot, BT package's readme table, and BT library lists

@mergify mergify bot deleted the mergify/bp/galactic/pr-2631 branch October 22, 2021 19:07
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