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

Devel ergo cub sn002 #670

Merged
merged 21 commits into from
Jul 18, 2024
Merged

Conversation

pattacini
Copy link
Member

Integrating upstream the ergoCubSN002 changes.

cc @S-Dafarra

@pattacini pattacini self-assigned this Jul 18, 2024
@pattacini pattacini requested a review from S-Dafarra July 18, 2024 13:16
@pattacini
Copy link
Member Author

pattacini commented Jul 18, 2024

To integrate upstream the changes, we need to solve the highlighted conflicts.
As a result, the fork branch will get modified and a git pull --rebase will need to be issued on the ergoCubSN002 system.

cc @S-Dafarra

@pattacini pattacini merged commit bf288b4 into robotology:devel Jul 18, 2024
1 check passed
fils99 pushed a commit to ami-iit/robots-configuration that referenced this pull request Sep 25, 2024
Co-authored-by: Stefano Dafarra <stefano.dafarra@gmail.com>
Co-authored-by: Antonio Consilvio <antonio.consilvio@iit.it>
Co-authored-by: Giulio Romualdi <giulio.romualdi@gmail.com>
Co-authored-by: ergocub <ergocub@iit.it>
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.

4 participants