-
Notifications
You must be signed in to change notification settings - Fork 39
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
Feature/humle dual arm demo #437
Closed
AlexanderStohr
wants to merge
46
commits into
robosoft-ai:humble
from
AlexanderStohr:feature/humle_dual_arm_demo
Closed
Feature/humle dual arm demo #437
AlexanderStohr
wants to merge
46
commits into
robosoft-ai:humble
from
AlexanderStohr:feature/humle_dual_arm_demo
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
…anderStohr/SMACC2 into feature/humle_dual_arm_demo
This pull request is in conflict. Could you fix it @AlexanderStohr? |
2 similar comments
This pull request is in conflict. Could you fix it @AlexanderStohr? |
This pull request is in conflict. Could you fix it @AlexanderStohr? |
Hi @AlexanderStohr, most (if not all) of the changes in these PRs have now been integrated into the humble branch so I'm going to close this out. Thank you for PR. |
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.
not sure if that works - just tried a rebase to humble and merged content from there.
this pull request is maybe simply only helpful for reference.
┆Issue is synchronized with this Jira Task by Unito