Skip to content

Update rtorrent.markdown#12252

Merged
frenck merged 1 commit into
home-assistant:nextfrom
smega:patch-1
Mar 14, 2020
Merged

Update rtorrent.markdown#12252
frenck merged 1 commit into
home-assistant:nextfrom
smega:patch-1

Conversation

@smega
Copy link
Copy Markdown
Contributor

@smega smega commented Mar 3, 2020

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.
    • 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 the current This PR goes into the current branch label Mar 3, 2020
@frenck
Copy link
Copy Markdown
Member

frenck commented Mar 3, 2020

@smega You checked the "Added documentation for a new feature I'm adding to Home Assistant" box, which makes sense from the content you are changing in this PR.

However, the parent PR isn't linked in the opening post and the branch is also targeting the current branch (although I expected it to be next in that case).

Please advise?

@frenck frenck added the in-progress This PR/Issue is currently being worked on label Mar 3, 2020
@smega
Copy link
Copy Markdown
Contributor Author

smega commented Mar 4, 2020

I thought I had created the PR to the next branch.
Shall we decline the PR and and I create a new one to next?

@frenck
Copy link
Copy Markdown
Member

frenck commented Mar 4, 2020

I would recommend on adding the link to the parent PR to the openings post and rebase this PR onto the next branch.

@smega
Copy link
Copy Markdown
Contributor Author

smega commented Mar 5, 2020

I am not really sure what you want me to do.
Can you just decline the PR and then I create a new one?

@probot-home-assistant probot-home-assistant Bot added the has-parent This PR has a parent PR in another repo label Mar 5, 2020
@klaasnicolaas klaasnicolaas added the needs-rebase The PR has been branched of the wrong base branch or targets an incorrect target branch label Mar 5, 2020
@klaasnicolaas
Copy link
Copy Markdown
Member

I will rebase the PR for you 😉 So just wait and relax for now

@klaasnicolaas klaasnicolaas self-assigned this Mar 5, 2020
@klaasnicolaas klaasnicolaas changed the base branch from current to next March 5, 2020 15:25
@probot-home-assistant probot-home-assistant Bot added next This PR goes into the next branch and removed current This PR goes into the current branch labels Mar 5, 2020
@klaasnicolaas klaasnicolaas requested review from klaasnicolaas and removed request for a team, Jc2k, andrey-git, bachya, jjlawren and robmarkcole March 5, 2020 15:26
Copy link
Copy Markdown
Member

@klaasnicolaas klaasnicolaas left a comment

Choose a reason for hiding this comment

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

✅ Approved. Can be merged as soon as the parent PR gets merged 👍

@klaasnicolaas klaasnicolaas added awaits-parent Awaits the merge of an parent PR and 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 Mar 5, 2020
@smega
Copy link
Copy Markdown
Contributor Author

smega commented Mar 5, 2020

I knew what rebase was but was not sure about link and parent PR.
Anyway thanks to both of you.

@frenck frenck added the parent-merged The parent PR has been merged already label Mar 13, 2020
@frenck frenck merged commit 3144430 into home-assistant:next Mar 14, 2020
@probot-home-assistant probot-home-assistant Bot removed awaits-parent Awaits the merge of an parent PR parent-merged The parent PR has been merged already labels Mar 14, 2020
guillempages pushed a commit to guillempages/home-assistant.io that referenced this pull request Mar 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

has-parent This PR has a parent PR in another repo next This PR goes into the next branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants