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

Dashing update #7

Merged
merged 6 commits into from Feb 6, 2020
Merged

Dashing update #7

merged 6 commits into from Feb 6, 2020

Conversation

Karsten1987
Copy link
Contributor

Signed-off-by: Karsten Knese <karsten@openrobotics.org>
Signed-off-by: Karsten Knese <karsten@openrobotics.org>
@Karsten1987 Karsten1987 self-assigned this Aug 8, 2019
Karsten1987 and others added 2 commits August 20, 2019 16:25
Signed-off-by: Karsten Knese <karsten@openrobotics.org>
Signed-off-by: Anas Abou Allaban <allabana@amazon.com>
@Karsten1987
Copy link
Contributor Author

Karsten1987 commented Feb 3, 2020

@piraka9011 @bmagyar this is up for review.

We have to land these changes in order to make dashing work and branch off to master correctly.

I've actually changed the base branch for this PR to master and will cherry-pick this commit on top of dashing for the backport.

@Karsten1987
Copy link
Contributor Author

@piraka9011 how come that all these commits are already on master? I don't see a PR attached to this? Do you push all the commits of this PR onto master?

@piraka9011
Copy link
Contributor

@Karsten1987 It looks like when making the master branch I created it off dashing_update and not dashing so that CI passes.
We can rebase master on to dashing instead and work from there.

@Karsten1987
Copy link
Contributor Author

the problem with this is that we have duplicate commits now.
Also, the current master seems to be broken: ros-controls/ros2_control#42

Signed-off-by: Karsten Knese <karsten@openrobotics.org>
Signed-off-by: Karsten Knese <karsten@openrobotics.org>
@Karsten1987
Copy link
Contributor Author

CI came back green, merging.

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.

None yet

2 participants