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.

Sign up for GitHub

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

Jump to bottom

Fix franka_ros upstream conflicts #6

Closed
rickstaa opened this issue Feb 17, 2020 · 1 comment
Closed

Fix franka_ros upstream conflicts #6

rickstaa opened this issue Feb 17, 2020 · 1 comment
Assignees
@rickstaa
Labels
bug Something isn't working
Milestone
Create Safe RL te...

Comments

@rickstaa
Copy link
Owner

As can be seen from the frankaemika/pull/52 the erdalpekel/simulation branch could not be merged with the upstream branch anymore due to changes made in the upstream branch. This commit fixes these conflicts such that the branch can again be merged with the upstream repository.
@rickstaa rickstaa added the bug Something isn't working label Feb 17, 2020
@rickstaa rickstaa self-assigned this Feb 17, 2020
@rickstaa
Copy link
Owner Author

Fixed in simulation-upstream-fi. A pull request was made to the erdalpekel/simulation branch such that it can be merged with the upstream branch.

@rickstaa rickstaa reopened this Feb 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@rickstaa rickstaa

Labels
bug Something isn't working
Projects
None yet
Milestone
Create Safe RL testing environment
Development

No branches or pull requests
1 participant
@rickstaa