Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add set volume function #71

Merged
merged 2 commits into from
Apr 7, 2024
Merged

Conversation

Liborsaf
Copy link
Contributor

@Liborsaf Liborsaf commented Apr 7, 2024

Closes #43 (still needs to implement HA side)

@Liborsaf
Copy link
Contributor Author

Liborsaf commented Apr 7, 2024

GitHub is showing already merged commits, weird 🤔

@alexmohr
Copy link
Owner

alexmohr commented Apr 7, 2024

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
Copy link
Contributor Author

Liborsaf commented Apr 7, 2024

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

tests/device_test.py Outdated Show resolved Hide resolved
@Liborsaf
Copy link
Contributor Author

Liborsaf commented Apr 7, 2024

Should be okay now, I guess?

@alexmohr alexmohr merged commit 737382f into alexmohr:master Apr 7, 2024
3 checks passed
@Liborsaf Liborsaf deleted the feature/set-volume branch April 7, 2024 10:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Improve volume control
2 participants