Fix pr247 conflicts #2
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ues in the User Guides (Kinovarobotics#241)
* Added the empty gripper option for gen3.launch.py * Format modifications
* Added Gen3 7DoF integration with Husky mobile robot from clearpath * Applied format modifications * Set the clearpath_config package to the latest commit * Finalizing Demo IROS * Modifications to README file
This reverts commit a60a515.
* Added Gen3 7DoF integration with Husky mobile robot from clearpath * Applied format modifications * Set the clearpath_config package to the latest commit * Finalizing Demo IROS * Modifications to README file * Finalized all the modifications needed for the repo (except formatting) * Formatting modifications * Final formatting modifications
…control for Gen3_Lite + Fixed bugs (Kinovarobotics#252) * Separated the arm and gripper controllers for Gen3_Lite in Kortex_bringup * Modified the Gen3_Lite related description and ros2_control files * Modified the Gen3_Lite Moveit Package for arm-gripper control separation
|
Thanks @vamsikalagaturu, do you mind discarding the unrelated commits? |
|
but they are the latest commits in the upstream. i rebased to head and resolved conflicts. so, it should be fine for the PR I think right? |
|
They aren't related to our changes, so they will mess up the PR |
|
can you try/verify? because "moveit_active" commit from the upstream caused the merge conflict that was mentioned in your PR. Or if its easier for you, you can directly rebase your original PR and discard this one. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.