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

Fix #837 Mergify/bp/humble/pr 805 #1188

Conversation

christophfroehlich
Copy link
Contributor

@christophfroehlich christophfroehlich commented Dec 3, 2023

I merged humble into the branch of #837. Compilation failed first, because some missing backports (#816) sneaked into it with newer backports (#1052).

@christophfroehlich christophfroehlich changed the title Fix Mergify/bp/humble/pr 805 Fix #837 Mergify/bp/humble/pr 805 Dec 3, 2023
@christophfroehlich christophfroehlich deleted the branch ros-controls:mergify/bp/humble/pr-805 December 3, 2023 21:57
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-805 branch December 3, 2023 21:57
@christophfroehlich christophfroehlich restored the mergify/bp/humble/pr-805 branch December 4, 2023 07:13
@bmagyar
Copy link
Member

bmagyar commented Dec 4, 2023

aye this is too big and messy

@christophfroehlich
Copy link
Contributor Author

christophfroehlich commented Dec 4, 2023

aye this is too big and messy

this is only merge humble branch into this one + one commit from my side to make it compile

@christophfroehlich
Copy link
Contributor Author

you could also rebase #837 and we then cherry-pick 0ab0e65 from this one.

@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-805 branch December 4, 2023 18:35
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.

2 participants