PR/dev Reconciliation #58
Merged
Conversation
This file contains 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
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…/build-image (esphome#7038) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Leo Schelvis <leo.schelvis@gmail.com>
…tore-python (esphome#7071) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com> Co-authored-by: Pavlo Dudnytskyi <pdudnytskyi@astrata.eu>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Co-authored-by: descipher <mike.laspina@gelidus.ca> Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
…l/additional code)
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.
Merges in the major changes made in the
upstream-prbranch, as well as theupr-addcomponents,upr-recallsetpoint, andupr-installerfunctionsbranches.This should, in theory, bring
devback into line with the work being done on the PR.Why wasn't it done this way in the first place?
Well, at the time it seemed like the PR was going to require a lot of rapid changes, but then when it was done the changes could be merged/overwritten into
dev. However since the PR is taking ages, I'd like to be able to continue development without things forking too far apart, so this is an attempt to get it all back in sync.Will this break my config?
I don't think so (based on my limited testing). There were a lot of internal code changes, but the config should be the same.