Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Adds SABnzdb queue count #4034

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 23, 2017
Merged

Adds SABnzdb queue count #4034

merged 1 commit into from
Nov 23, 2017

Conversation

bigwoof
Copy link
Contributor

@bigwoof bigwoof commented Nov 21, 2017

adding documentation for proposed change

Description:
Adding documentation for sensor to show number of items in SABnzdb queue

Pull request in home-assistant (if applicable): home-assistant/home-assistant#

Checklist:

  • Branch: Fixes, changes and adjustments should be created against current. New documentation for platforms/components and features should go to next.
  • The documentation follow the standards.

@frenck frenck added the new-feature This PR adds documentation for a new Home Assistant feature to an existing integration label Nov 21, 2017
@frenck
Copy link
Member

frenck commented Nov 21, 2017

Thanks, @bigwoof! Pretty nice addition 👍

@frenck frenck changed the base branch from current to next November 21, 2017 16:59
@frenck frenck changed the base branch from next to current November 21, 2017 16:59
@frenck
Copy link
Member

frenck commented Nov 21, 2017

@bigwoof You have created this PR against the current branch. Could you please rebase it on the next branch?

Copy link
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.

Dismissing my approval to avoid accidental merge onto the wrong branch.

@frenck frenck changed the title adding queue count adding SABnzdb queue count Nov 21, 2017
@frenck frenck changed the title adding SABnzdb queue count Adds SABnzdb queue count Nov 21, 2017
@bigwoof bigwoof changed the base branch from current to next November 21, 2017 22:27
@bigwoof
Copy link
Contributor Author

bigwoof commented Nov 21, 2017

I have re-based the change to the Next branch (I think) - this is my fist contribution so please bare with me. hopefully I have done things correctly.

@frenck
Copy link
Member

frenck commented Nov 22, 2017

@bigwoof No, you've changed the target branch. Not rebased it.

@frenck frenck changed the base branch from next to current November 22, 2017 12:38
@bigwoof
Copy link
Contributor Author

bigwoof commented Nov 23, 2017

@frenck, sorry I am stumped - I am not sure how to change the base. I am a little lost if you/someone can point me in the right direction that would be great. That way I can at lease make some contributions to the documentation in the future too and I will be doing it correctly.

@frenck frenck self-assigned this Nov 23, 2017
adding documentation for proposed change
@frenck frenck changed the base branch from current to next November 23, 2017 20:12
@frenck
Copy link
Member

frenck commented Nov 23, 2017

@bigwoof I've done it for you, in this case, I can imagine it is not an easy task.

For future reference, this is what I have done:

git clone https://github.com/bigwoof/home-assistant.github.io.git bigwoof
cd bigwoof
git remote add upstream [email protected]:home-assistant/home-assistant.github.io.git
git fetch upstream
git checkout next
git pull upstream next
git checkout patch-4
git rebase --onto next patch-4~1
git push -f

Basically, what this does, taking your last commit and placing it on top of the latest version of the next branch.

P.s. for future contributions, please be sure to branch off the right branch. For new features (like this one), use next. For fixing stuff in the current documentation (e.g., typos) use current to create a branch off.

@frenck frenck merged commit 18ee158 into home-assistant:next Nov 23, 2017
@bigwoof
Copy link
Contributor Author

bigwoof commented Nov 24, 2017

OK I see now - my problem was that I simply used the github web UI to make the documentation edits and I don't know if there is a way to set the base there - I think it only applies to current. If I was to keep doing this via the browser when I make changes I assume that it will only work for edits on the current branch - eg. helping with adding documentation for existing features.
If I add new features then I will need to make the changes via the command line and pushing it as you describe above.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

2 participants