search

alexmohr / sonyapilib

Contains a python api to control sony devices.
MIT License
20 stars 11 forks source link

Add set volume function #71

Closed Liborsaf closed 5 months ago

Liborsaf commented 5 months ago

Closes #43 (still needs to implement HA side)

Liborsaf commented 5 months ago

GitHub is showing already merged commits, weird 🤔

alexmohr commented 5 months ago

GitHub is showing already merged commits, weird 🤔

That's because there is a merge commit. When pulling changes on from master you should use rebase instead (git pull --rebase origin master). Don't worry we will just squash the commits when merging this. At least the GitHub Webinterface Shows that there some conflicts left

Liborsaf commented 5 months ago

GitHub is showing already merged commits, weird 🤔

That's because there is a merge commit. When pulling changes on from master you should use rebase instead (git pull --rebase origin master). Don't worry we will just squash the commits when merging this. At least the GitHub Webinterface Shows that there some conflicts left

Ahh, I see. I thought, that i rebased it, but obviously not then :D

But for conflicts it says for me "This branch has no conflicts with the base branch" this seems weird for me

Liborsaf commented 5 months ago

Should be okay now, I guess?