Repository navigation
Consolidate all committed branch history into fork main - #14
Merged
Merged
Conversation
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.
Include the two remaining upstream-contribution merge commits (scan-options and Slovenian contribution) in this fork's main history. All other local and origin branch tips are already ancestors of main.
This PR changes no files: the resulting tree is exactly
60ef66b2a32bfbad1a59b5e208cdcd9927470a6c, identical to maine8a40dfand the fully tested PR #13. Both proposed merges were verified with merge-tree, followed by a zero-diff comparison. Existing successful validation is CI run 41509541502; no application change calls for new local tests.The uncommitted HA survey remains preserved in its separate worktree and is outside this history consolidation. No branches are deleted, no upstream PR is created, and no installed program or user data is changed.