Skip to content

Improve Docker and Kubernetes support for KNX#17095

Merged
frenck merged 2 commits intohome-assistant:nextfrom
plomosits:current
Mar 29, 2021
Merged

Improve Docker and Kubernetes support for KNX#17095
frenck merged 2 commits intohome-assistant:nextfrom
plomosits:current

Conversation

@plomosits
Copy link
Copy Markdown
Contributor

Proposed change

Document new config parameter for pull request home-assistant/core#48065

Type of change

  • Spelling, grammar or other readability improvements (current branch).
  • Adjusted missing or incorrect information in the current documentation (current branch).
  • Added documentation for a new integration I'm adding to Home Assistant (next branch).
  • Added documentation for a new feature I'm adding to Home Assistant (next branch).
  • Removed stale or deprecated documentation.

Additional information

Checklist

  • This PR uses the correct branch, based on one of the following:
    • I made a change to the existing documentation and used the current branch.
    • I made a change that is related to an upcoming version of Home Assistant and used the next branch.
  • The documentation follows the Home Assistant documentation standards.

@probot-home-assistant probot-home-assistant Bot added has-parent This PR has a parent PR in another repo in-progress This PR/Issue is currently being worked on needs-rebase The PR has been branched of the wrong base branch or targets an incorrect target branch labels Mar 22, 2021
@probot-home-assistant probot-home-assistant Bot added the current This PR goes into the current branch label Mar 22, 2021
Copy link
Copy Markdown
Member

@farmio farmio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is targeted against the wrong branch. next would be right imho.

Comment thread source/_integrations/knx.markdown Outdated
@plomosits plomosits changed the base branch from current to next March 22, 2021 16:04
Copy link
Copy Markdown
Member

@frenck frenck left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are unrelated commits in this PR, due to the change of target branch. Please git rebase.

@frenck
Copy link
Copy Markdown
Member

frenck commented Mar 22, 2021

Seems like you performed a merge instead of a rebase, as there are now more unrelated commits. Please make sure you perform a rebase.

@frenck frenck added the parent-merged The parent PR has been merged already label Mar 22, 2021
@farmio
Copy link
Copy Markdown
Member

farmio commented Mar 22, 2021

Hey!
When you're stuck in a rebase/merge dilemma here (which happens to me more often than I'd like to admit) you could probably just do

# 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 --force

good luck!

@plomosits plomosits requested a review from frenck March 22, 2021 21:38
@frenck
Copy link
Copy Markdown
Member

frenck commented Mar 29, 2021

Thanks, @plomosits 👍

@frenck frenck merged commit 8289a01 into home-assistant:next Mar 29, 2021
@probot-home-assistant probot-home-assistant Bot removed needs-rebase The PR has been branched of the wrong base branch or targets an incorrect target branch in-progress This PR/Issue is currently being worked on parent-merged The parent PR has been merged already labels Mar 29, 2021
@github-actions github-actions Bot locked and limited conversation to collaborators Mar 30, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

cla-signed current This PR goes into the current branch has-parent This PR has a parent PR in another repo

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants