DarwinsBuddy / WienerNetzeSmartmeter

A home-assistant integration supporting WienerNetze Smartmeters as sensors
144 stars 15 forks source link

Fix consumption update for live sensor of second zaehlpunkt #2 #264

Closed tschoerk closed 1 month ago

tschoerk commented 1 month ago

Now with a rebase (compare to #233)

codecov[bot] commented 1 month ago

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Project coverage is 85.06%. Comparing base (abb153e) to head (10c0774).

Additional details and impacted files ```diff @@ Coverage Diff @@ ## main #264 +/- ## ========================================== + Coverage 81.25% 85.06% +3.81% ========================================== Files 5 5 Lines 288 288 ========================================== + Hits 234 245 +11 + Misses 54 43 -11 ```

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.

DarwinsBuddy commented 1 month ago

you again created merge commits :grimacing:

I pushed your branch into my remote https://github.com/DarwinsBuddy/WienerNetzeSmartmeter/tree/bugfix/loadConsumption and rebased it again via (I have written below like you would do it from the perspective of your fork)

git checkout main  # checkout main
git pull  # get all commits
git checkout origin bugfix/loadConsumption  # checkout your branch on your remote
git rebase --onto main  # rebase the feature branch, s.t. its parent points to main
git push --force-with-lease  #  Override your feature branch, s.t. this PR is updated

Rebase automatically removes any merge commits for you, so you'll end up with a clean, linear history :)

tschoerk commented 1 month ago

Mhh ok I thought I did it exactly that way. The fork looks very good :) I will try again :)

tschoerk commented 1 month ago

I synced now with the upstream and can't retry. There will be opportunities to try again in the future. I will open a PR with your branch.