Skip to content

Update glances.markdown #11352

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 1 commit into from
Closed

Update glances.markdown #11352

wants to merge 1 commit into from

Conversation

engrbm87
Copy link
Contributor

@engrbm87 engrbm87 commented Dec 3, 2019

Description:
Update list of created sensors based on collected data from glances_api.

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

Checklist:

  • Branch: next is for changes and new documentation that will go public with the next Home Assistant release. Fixes, changes and adjustments for the current release should be created against current.
  • The documentation follows the standards.

@probot-home-assistant probot-home-assistant bot added has-parent This PR has a parent PR in another repo next This PR goes into the next branch labels Dec 3, 2019
@engrbm87 engrbm87 mentioned this pull request Dec 3, 2019
Merged
9 tasks
@frenck frenck added the new-feature This PR adds documentation for a new Home Assistant feature to an existing integration label Dec 3, 2019
frenck
frenck approved these changes Dec 3, 2019
View reviewed changes
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.

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

@probot-home-assistant probot-home-assistant bot added the parent-merged The parent PR has been merged already label Feb 10, 2020
frenck
frenck requested changes Feb 11, 2020
View reviewed changes
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.

@engrbm87 Could you please resolve the merge conflicts? Thanks! 👍

@frenck frenck added the in-progress This PR/Issue is currently being worked on label Feb 11, 2020
@engrbm87
Copy link
Contributor Author

@engrbm87 Could you please resolve the merge conflicts? Thanks! 👍

I can't seem to find a link where i can solve the merge conflicts. I have initially updated the document directly on github so please let me know i can resolve the conflict.

@frenck
Copy link
Member

frenck commented Feb 11, 2020

@engrbm87 You can't.
You have to checkout it locally, rebase it onto the latest version of the origin next branch and resolve the conflict along the way. After that is done, you can push your changes back to GitHub.

@engrbm87
Copy link
Contributor Author

@frenck I was only able to create a new PR #12050. I hope that would ok.

@probot-home-assistant probot-home-assistant bot removed in-progress This PR/Issue is currently being worked on parent-merged The parent PR has been merged already labels Feb 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@frenck frenck frenck requested changes

Assignees

@engrbm87 engrbm87

Labels
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 next This PR goes into the next branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@engrbm87 @frenck @klaasnicolaas