Skip to content

Clarify Orange Pi#12918

Merged
frenck merged 4 commits into
home-assistant:currentfrom
pascallj:current
Apr 13, 2020
Merged

Clarify Orange Pi#12918
frenck merged 4 commits into
home-assistant:currentfrom
pascallj:current

Conversation

@pascallj
Copy link
Copy Markdown
Contributor

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

  • Link to parent pull request in the codebase:
  • Link to parent pull request in the Brands repository:
  • This PR fixes or closes issue:

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.

The actual brand name is "Orange Pi", with a space and capital P.
Add a section why some pins may not be usable with the Orange Pi integration. Should clarify issues like this: home-assistant/core#30790.
@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 Apr 13, 2020
@probot-home-assistant
Copy link
Copy Markdown

It seems that this PR is targeted against an incorrect branch since it has a parent PR on one of our codebases. Documentation that needs to be updated for an upcoming release should target the next branch. Please change the target branch of this PR to next and rebase if needed.

@probot-home-assistant probot-home-assistant Bot added the current This PR goes into the current branch label Apr 13, 2020
@pascallj
Copy link
Copy Markdown
Contributor Author

I think Probot thinks there is a parent PR because of the linked issue from core. This linked issue is only for future reference and therefore there is no parent PR and no need to rebase.

@frenck frenck removed 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 Apr 13, 2020
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.

Thanks for the PR @pascallj!

It indeed based that message on the fact it was linked to a parent PR. We can ignore that in this case 👍

I've made a couple of small adjustments, so it matches the rest of our documentation.

@frenck frenck merged commit e344753 into home-assistant:current Apr 13, 2020
@pascallj
Copy link
Copy Markdown
Contributor Author

Thank you.

But in that case, shouldn't 2e91611 be reverted?

@frenck
Copy link
Copy Markdown
Member

frenck commented Apr 13, 2020

Oh right, or a new PR...

@pascallj
Copy link
Copy Markdown
Contributor Author

Oh right, or a new PR...

#12928, done.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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.

2 participants