Skip to content

Mqtt fan command templates#17150

Closed
jbouwh wants to merge 78 commits intohome-assistant:currentfrom
jbouwh:mqtt-fan-command-templates
Closed

Mqtt fan command templates#17150
jbouwh wants to merge 78 commits intohome-assistant:currentfrom
jbouwh:mqtt-fan-command-templates

Conversation

@jbouwh
Copy link
Copy Markdown
Contributor

@jbouwh jbouwh commented Mar 27, 2021

Proposed change

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.
  • The documentation follows the Home Assistant documentation standards.

timmo001 and others added 30 commits February 24, 2021 23:29
Co-authored-by: Klaas Schoute <klaas_schoute@hotmail.com>
Co-authored-by: Bram Kragten <mail@bramkragten.nl>
Co-authored-by: Franck Nijhof <git@frenck.dev>
Co-authored-by: Franck Nijhof <frenck@frenck.nl>
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Co-authored-by: Franck Nijhof <git@frenck.dev>
@jbouwh
Copy link
Copy Markdown
Contributor Author

jbouwh commented Mar 29, 2021

This PR adds a new feature to the codebase, thus depends on a next release of Home Assistant Core.

Therefore, this PR should go into the next branch. Please change the target branch of this PR to next and git rebase this PR if needed.

Thanks 👍

I am not sure. The PR for code change is targeted to current, not to next, I have changed this later in this documention PR.

Co-authored-by: Klaas Schoute <klaas_schoute@hotmail.com>
Co-authored-by: Franck Nijhof <frenck@frenck.nl>
@frenck
Copy link
Copy Markdown
Member

frenck commented Mar 29, 2021

I am sure, this targets the wrong branch. Please adjust as instructed in my last response.

@jbouwh
Copy link
Copy Markdown
Contributor Author

jbouwh commented Mar 29, 2021

I think I need some help, I messed up this PR in order to target it it right.

@frenck frenck changed the base branch from current to next March 29, 2021 11:19
@frenck frenck changed the base branch from next to current March 29, 2021 11:19
@frenck
Copy link
Copy Markdown
Member

frenck commented Mar 29, 2021

It seems like you have been merging branches, instead of rebasing. At this point, either strip of the merge and do a rebase after that or hard reset the branch and cherry-pick your changes.

Alternatively, creating a new PR based from the next branch is an option as well.

@jbouwh
Copy link
Copy Markdown
Contributor Author

jbouwh commented Mar 29, 2021

I will start a new PR for this.

@jbouwh jbouwh closed this 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 labels Mar 29, 2021
@jbouwh jbouwh deleted the mqtt-fan-command-templates branch March 29, 2021 15:06
@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 new-feature This PR adds documentation for a new Home Assistant feature to an existing integration

Projects

None yet

Development

Successfully merging this pull request may close these issues.