Repository navigation
fix: repair mis-resolved merge conflicts in main.rs and decoder.rs - #13
Merged
Merged
Conversation
The stacked feature branches were merged out of order, and the manual conflict resolutions left src/main.rs with unbalanced braces (the old discovery loop was interleaved with the new scan module) and src/decoder.rs with a duplicated BthomeDeviceInfo struct and stray fragments. Restore both files to the state of the final stacked branch (feat/encrypted-payloads), which contains all merged features. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
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
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.
Problem
CI on
mainis currently failing:The stacked feature branches (#3–#10) were merged out of order, and the manual conflict resolutions left the tree broken:
src/main.rs— the old discovery loop was interleaved with the newscanmodule code, leaving unbalanced braces, so the crate no longer compiles.src/decoder.rs— theBthomeDeviceInfostruct and the--- BTHome Decoder ---section are duplicated, with stray fragments in between.Fix
Restore both files to the state of the final stacked branch (
feat/encrypted-payloads, merged in #10), which already contains all the merged features. After this commit the tree is byte-identical to that branch — no feature is lost or altered.Verification
Full CI (fmt, clippy, tests, build, and both musl cross-compiles) passes on this branch: https://github.com/discostur/mitempr/actions/runs/30987477744
🤖 Generated with Claude Code