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

Pybinding task actuation equality #234

Open
wants to merge 9 commits into
base: devel
Choose a base branch
from

Conversation

rua0ra1
Copy link

@rua0ra1 rua0ra1 commented Aug 4, 2024

Hi @andreadelprete,
As discussed in the #233 . I have implemented the python bindings for TaskActuationEquality by following the examples from other bindings. Please have a look and let me know your suggestions and feedback. Thank you and have a nice day :)

@hrp2-14
Copy link

hrp2-14 commented Aug 4, 2024

Hi ! This project doesn't usually accept pull requests on the main branch.
If this wasn't intentionnal, you can change the base branch of this PR to devel
(No need to close it for that). Best, a bot.

@rua0ra1 rua0ra1 changed the base branch from master to devel August 4, 2024 22:45
@andreadelprete
Copy link
Collaborator

Hi @rua0ra1 , thanks for this PR. I don't know why, but it seems this PR also includes a commit from February, authored by @egordv , which added python bindings for the ContactTwoFrame class. Any idea how this could happen? Could you please fix this before I review the PR?

@rua0ra1
Copy link
Author

rua0ra1 commented Aug 13, 2024

Hi @andreadelprete, Thanks for the reply. I have no idea how it happened. But, I can certainly double check from side and fix the issue. Thank you and have a good one :)

@rua0ra1
Copy link
Author

rua0ra1 commented Aug 18, 2024

Hi @andreadelprete , I had a look at the issue. I think the problem is, I have created a new branch from master which already includes changes/PR from the @egordv as shown in the figure
tsid

I believe these changes from @egordv are missing from the devel branch.

When I was submitting my PR initially to merge with master branch. I have received a warning that i should merge my changes with devel branch instead of master. So, I have changed my PR to merge with devel.

One way of fixing this is to merge my changes to master directly. But, I am not sure whether I can do that as I received a warning earlier. I really appreciate it if you can tell me how to proceed.

Thank you.

@andreadelprete
Copy link
Collaborator

You're right. This actually comes from a mistake I made when merging the PR by @egordv , I accidentally merged it on master rather than on devel. I don't know what the best way to get out of this is, but maybe @nim65s can suggest something?

@nim65s
Copy link
Contributor

nim65s commented Aug 19, 2024

I merged master into devel, so this commit is now in devel. Can you now rebase your PR on the current devel, @rua0ra1 ?

@rua0ra1
Copy link
Author

rua0ra1 commented Aug 19, 2024

Hi @nim65s , I tried to do it. But, i can't see the update branch option to rebase.

@nim65s nim65s force-pushed the pybinding_TaskActuationEquality branch from 84f401b to 91af876 Compare August 19, 2024 23:25
@nim65s nim65s force-pushed the pybinding_TaskActuationEquality branch from 91af876 to 1a59d53 Compare August 19, 2024 23:25
@nim65s
Copy link
Contributor

nim65s commented Aug 19, 2024

Ok, this should be good now.

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