Nightly: resolve upstream merge conflict (2026-09-20) - #126
Open
github-actions[bot] wants to merge 25 commits into
Open
github-actions[bot] wants to merge 25 commits into
github-actions[bot] wants to merge 25 commits into
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
11 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.
The nightly build could not merge
masterintoevcc-master; the upstream sync needs manual conflict resolution.This branch snapshots
evcc-master(the upstream code that failed to merge). Resolve the conflicts againstmaster— keep the fork patches (e.g. thePMaxImphard grid-import cap and the optimizer features) — then merge this PR.Nightly Docker builds are paused until a
resolve/upstream-*PR is merged.