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

Adding documentation to collision detection #1645

Merged
merged 4 commits into from
Sep 17, 2019

Conversation

j-petit
Copy link
Contributor

@j-petit j-petit commented Aug 26, 2019

Description

As during the rebase on master of the feature branch feature-bullet-trajopt I ran into merge conflicts because of deleted files in master, I dropped the two documentation PRs #1488 and #1505 from the feature branch.

Instead I went through them again and created this new PR targeting master. This does not include changes which have not been reviewed in #1488 or #1505. Therefore, could be merged fast.

Copy link
Contributor

@felixvd felixvd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not approving right away to avoid an accidental merge, but this is fine with me overall. Only typos and nits in this review really.

@v4hn v4hn merged commit 871f3a0 into moveit:master Sep 17, 2019
v4hn pushed a commit to v4hn/moveit that referenced this pull request Sep 17, 2019
Backport relevant documentation to melodic-devel
@j-petit
Copy link
Contributor Author

j-petit commented Sep 17, 2019

Thanks @v4hn!

BryceStevenWilley pushed a commit that referenced this pull request Sep 17, 2019
Backport relevant documentation to melodic-devel
henningkayser pushed a commit to PickNikRobotics/moveit that referenced this pull request Nov 21, 2019
* Collision detection documentation from moveit#1488

* Collision detection documentation from moveit#1505
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.

None yet

4 participants