Merged
Conversation
accidentally reverted in release_1.3.0 to main Signed-off-by: Andy Fragen <andy@thefragens.com>
Contributor
colincwc
previously approved these changes
Mar 16, 2026
johnbillion
approved these changes
Mar 16, 2026
Contributor
Author
|
Doesn’t seem like I have permission to merge cause it’s my PR |
costdev
approved these changes
Mar 16, 2026
Member
costdev
left a comment
costdev
left a comment
There was a problem hiding this comment.
Documenting
The accident in the Updater::upgrader_source_selection() method occurred when:
release_1.3.0was merged intomainwith a parameter change to the method in this commitmainwas subsequently merged intorelease_1.4.0in this commit.
This produced a merge conflict:
- A parameter type change was made in the method in
release_1.3.0 - The
statickeyword was added to the method inrelease_1.4.0(#428)
Rather than both changes being included, the merge conflict was resolved by rejecting the static keyword and only including the parameter type change coming in from main.
Easily missed, and we've found it now.
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
4 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.
accidentally reverted in release_1.3.0 to main