Repository navigation
chore(git): merge master into v2-phase1-architecture to resolve PR #232 conflicts - #878
Merged
GreenGrassBlueOcean merged 13 commits intoNov 8, 2026
Merged
Conversation
… & test comparisons (#687) docs(readme): modernize master landing page with side-by-side feature & test comparisons (#687) - Side-by-side feature & architecture comparison table between legacy stable (v0.9.4) and modern beta (v2.0.0b15 / v2-phase1-architecture) - Automated testing & quality comparison table (3,464 tests in release, 100% statement coverage, golden frame corpus, syrupy snapshots) - Safe dual installation tracks (temporary directory download/extraction verification, failure abort, recovery file preservation) - Hardware profiles, entity domains, bus monitor Lovelace card, and documentation links - Comprehensive community credits recognizing core integration architects, UI contributors, and physical bus trace submitters
… v2.0.0b16 vs v0.9.4
…eadme-b16 docs(readme): update master landing page comparison for v2.0.0b15 and v2.0.0b16 vs v0.9.4
… and anonymous Bus Monitor notice
chore(github): add issue forms & PR template to default branch (master)
docs: align default branch README with v2.0.0b17 beta release and expanded community credits
|
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
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.
Important
Merge Method: Merge this pull request using "Create a merge commit" (
merge), not Squash or Rebase. A merge commit preservesmaster(d8b363b8) as an ancestor ofv2-phase1-architecture, advancing the merge-base of #232 frome2ce4044tod8b363b8and clearing all merge conflicts on #232.What is the problem
#232 (
v2-phase1-architecture→master) currently reports merge conflicts (mergeable_state: dirty) on four files becausemasterreceived four documentation/template backport PRs (#687, #768, #789, #859) after thee2ce4044merge-base:.github/ISSUE_TEMPLATE/audio_field_report.yml,.github/ISSUE_TEMPLATE/bug_report.yml, and.github/ISSUE_TEMPLATE/device_request.yml— add/add conflicts between the2.0.0b16issue forms backported tomasterin chore(github): add issue forms & PR template to default branch (master) #789 and the2.0.0b17-bumped templates onv2-phase1-architecture.README.md— content divergence between the temporaryv0.9.4 vs v2.0.0b17landing-page comparison onmaster(docs: align default branch README with v2.0.0b17 beta release and expanded community credits #859) and the canonical v2README.md(with sentinel tables enforced byscripts/sync_documentation.py) onv2-phase1-architecture.Because
v2-phase1-architectureis governed by theintegration-branchruleset (pull request required, non-fast-forward disabled), conflicts must be resolved via a sync PR intov2-phase1-architecture.Unblocks #232
What is the solution
master(d8b363b8) intov2-phase1-architecture(0105f484):v2-phase1-architecture's canonical versions of.github/ISSUE_TEMPLATE/audio_field_report.yml,.github/ISSUE_TEMPLATE/bug_report.yml,.github/ISSUE_TEMPLATE/device_request.yml, andREADME.md.2.0.0b17template prompt ͛community trace credits:(e.g. 2.0.0b16)prompt description in.github/ISSUE_TEMPLATE/device_request.yml(line 29) to(e.g. 2.0.0b17).masterin docs: align default branch README with v2.0.0b17 beta release and expanded community credits #859 (@gimprota76,@paoloboatto,@andrea-mag,@cricri72,@emil-d) into theCredits & Attributionsection ofREADME.md.State Diagram
N/A — git ancestry synchronization, issue template prompt alignment, and
README.mdattribution update only.Hardware Verification
How is it tested
git merge-base HEAD openwebnet-ha/masterverified equal tod8b363b8ef51aefebf020aede5cf5921ba6b3d7f(openwebnet-ha/masterHEAD).python -m ruff check custom_components tests scripts: passed (0 violations).python scripts/verify_ha_standards.py: passed (all Platinum Quality Scale andREADME.mddomain checks green).python scripts/sync_documentation.py --check: passed (all sentinel tables and markdown links/anchors validated with 0 broken links).Where are the traces
What does the Firmware Oracle / Encyclopedia say
scripts/sync_documentation.py --check.Checklist
What is the problem,What is the solution,State Diagram,How is it tested,Where are the traces,What does the Firmware Oracle / Encyclopedia say).ruff,scripts/verify_ha_standards.py, andscripts/sync_documentation.py --checkpass.