Open
Conversation
Signed-off-by: Dominik <dl6er@dl6er.de>
Signed-off-by: Dominik <dl6er@dl6er.de>
Signed-off-by: Dominik <dl6er@dl6er.de>
Signed-off-by: Dominik <dl6er@dl6er.de>
…uarantees clearing of the whole union (except for static storage duration initialization), it just initializes the first union member to zero. Signed-off-by: Dominik <dl6er@dl6er.de>
Signed-off-by: yubiuser <github@yubiuser.dev>
Member
Author
|
Mhhh... maybe I got confused which branch needs to be merged into which branch. @DL6ER Is there any special handling inside |
Member
|
Yes, the typical workflow is a hard reset on development and force push onto this one. It's not used for anything besides the internal tests during upgrades of the ftl-build container |
DL6ER
force-pushed
the
special/CI_development
branch
from
9365126 to
d35f22d
Compare
Member
|
What is |
Member
Author
|
It was intended to solve the merge conflict I observed in #2853 were I just tried to merge |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is #2853 after resolving the merge conflicts.