forked from mileperhour/localtuya-homeassistant
-
Notifications
You must be signed in to change notification settings - Fork 567
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
Fix reset behaviour (with history fixed) #1314
Open
CloCkWeRX
wants to merge
15
commits into
rospogrigio:master
Choose a base branch
from
CloCkWeRX:fix_reset_behaviour
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains 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
…altuya into fix_reset_behaviour
@CloCkWeRX - When I try to sync via github, it says i can't and that I'm already up to date with upstream? |
@CloCkWeRX looking to get this going again - I've pulled the latest code from main and there were no clashes of changes. In #1273 the validate-hacs check is failing due to a 500 server error. Any thoughts here? |
Well, these must be busted in master
|
@CloCkWeRX - Is there anything I can do to assist? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
#1273 but with history a tiny bit cleaner.
@sibowler - I think your branch just wants 1x more git pull from upstream.
Recommend squash merging to clean things up a bit further