Improve Docker and Kubernetes support for KNX#17095
Merged
frenck merged 2 commits intohome-assistant:nextfrom Mar 29, 2021
Merged
Improve Docker and Kubernetes support for KNX#17095frenck merged 2 commits intohome-assistant:nextfrom
frenck merged 2 commits intohome-assistant:nextfrom
Conversation
farmio
requested changes
Mar 22, 2021
Member
farmio
left a comment
There was a problem hiding this comment.
This is targeted against the wrong branch. next would be right imho.
frenck
requested changes
Mar 22, 2021
Member
frenck
left a comment
There was a problem hiding this comment.
There are unrelated commits in this PR, due to the change of target branch. Please git rebase.
Member
|
Seems like you performed a merge instead of a rebase, as there are now more unrelated commits. Please make sure you perform a rebase. |
Member
|
Hey! # update upstream
git fetch upstream
# discard all changes, clear the branch, set it to the target
git reset --hard upstream/next
# apply your first commit
git cherry-pick e077e98
# apply the second too
git cherry-pick a963d75
# push it
git push --forcegood luck! |
for knx tunneling configuration.
farmio
approved these changes
Mar 22, 2021
frenck
approved these changes
Mar 29, 2021
Member
|
Thanks, @plomosits 👍 |
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Proposed change
Document new config parameter for pull request home-assistant/core#48065
Type of change
currentbranch).currentbranch).nextbranch).nextbranch).Additional information
Checklist
currentbranch.nextbranch.