FlexMeasures / flexmeasures / 34228957725

85%

main: 88%

Build Type

Pull #2494

github

Committed by Flix6x

Commit Message

Merge branch 'main' into fix/source-precedence

#2472 was squash-merged, so main now holds its content as one commit with no history in common with
the commits this branch carries, and every overlapping hunk conflicts between two spellings of the
same change.

Merging with `-X ours` settles those by construction: where the two sides overlap they say the same
thing, so this branch's side is right, and everything else from main comes in normally. This branch's
own content is unchanged by the merge, at the same 5 files and +399/-103 it had against the old stack
base.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01WS6V8nZyRzMxsvqGnNpUTk
Signed-off-by: F.N. Claessen <claessen@seita.nl>

Pull Request Pull Request #2494: Settle which source wins an event with one rule, in two steps

Coverage Stats

63 of 69 new or added lines in 2 files covered. (91.3%)

1 existing line in 1 file now uncovered.

18461 of 21725 relevant lines covered (84.98%)

0.85 hits per line