Reconcile main and the active development branch #20
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
… increasing the offset so that arm goes inside the bin and attaches the object firmly
…urmr_tahoma into soofiyan-new-grasp-with-normals
add offsets to avoid pod lip for both columns 1 and 4
…g new retry mechanism with human input
…m and adding changes for the manipulation contraints for better manipulability
nickswalker
commented
Aug 28, 2023
There was a problem hiding this comment.
This looks like build output. Does this need to be tracked? If not, add *.egg-info to .gitignore to prevent accidentally adding it to the repo again.
There was a problem hiding this comment.
I think we don't need to track this. Maybe I forgot to add this in the .gitignore file. Thank you.
nickswalker
commented
Aug 28, 2023
…es and different bin depths. Also incorporating changes for the manual calibration for different pods.
…rly with the calibrated rgb image
|
In the future, please use Better yet, cherry pick directly where you can: https://www.atlassian.com/git/tutorials/cherry-pick |
Merged
|
Will merge with the rebase #24 |
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.
The
aurmr_demoworkspace is running an only-slightly modified version of this branch, but it has not been reconciled with the main branch in almost a year. In some instances, files from commits from the main branch have been manually pasted (i.e. files copied and new commits made, vs cherry picking) into this branch, like with 3a825cc...eaca979 (#16) turning into e08fe8b.I think we should rebase this branch ontop of main, then merge it into main. The rebase should end up nulling out the content of commits which duplicate earlier commits from main while highlighting any conflicting changes for review.
@Soofiyan I'm happy to meet and provide Git support so we can resolve issues during the merge.