Skip to content
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

Adding Duplicati, ValetudoMap, ESPHome, Monitor and Hass-Configurator #6

Open
wants to merge 10 commits into
base: master
Choose a base branch
from

Conversation

Slyke
Copy link
Collaborator

@Slyke Slyke commented Apr 19, 2020

Adding Duplicati, ValetudoMap, ESPHome, Monitor and Hass-Configurator

Changed HASSIO datadir to be inside volumes folder, for including in backup.

It's my first Pull Req, so any comments is welcome :)

This is from: gcgarner#135 Contributor: @bloody2k

@shaxxx
Copy link

shaxxx commented Jan 10, 2021

It's been 8 months, is this going to get merged or not?

@Paraphraser
Copy link

I think it's exactly what it says - waiting on the PR author to resolve conflicts. I don't know enough about Git to be able to say whether someone else can "take over a PR" or "clone their own copy of a PR" to resolve a conflict when the original author can't or won't (or maybe simply isn't aware).

@Slyke might be able to help (he's helped me plenty with Git issues) but it might boil down to someone (you?) needing to replicate the guts of the PR and submit it as another PR.

@shaxxx
Copy link

shaxxx commented Jan 11, 2021

@Paraphraser thanks for the update.
However, things are not so simple here.
This is copy/paste of the original pull request, from another repository, and as far as I can tell, conflict is the result of the original PR author submitting to another repository.
Term "PR author" is not so clear in this case.
I believe it would be in best interest to resolve this PR in one way or another.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants