Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.

created rule for dji.com - #4368

Closed
schmiedecker wants to merge 1 commit into
EFForg:masterfrom
schmiedecker:dji_
Closed

schmiedecker wants to merge 1 commit into
EFForg:masterfrom
schmiedecker:dji_

Conversation

@schmiedecker

Copy link
Copy Markdown
Contributor

No description provided.

@fuglede

fuglede commented Mar 14, 2016

Copy link
Copy Markdown
Contributor

Thanks for the PR. It looks like your git submodules are out of sync with those in the master branch; try running a git submodule update.

@schmiedecker

Copy link
Copy Markdown
Contributor Author

'done, has not changed anything? Could you explain the issue a bit? Thx ...

@fuglede

fuglede commented Mar 16, 2016

Copy link
Copy Markdown
Contributor

Sure thing: The HTTPS Everywhere repository hooks into a few other git repositories (for instance to get translations and tests), called submodules, and the way they are kept synchronized is by having the working (main) repository keep track of the specific commit hashes of the subrepositories. Now, in your case, it seems that your local copy of the repository is pointing at the wrong versions of the subrepositories. This becomes evident when you look at the files changed for this PR: if we just merged it, those two subrepositories would end up in incorrect versions.

@J0WI J0WI added the conflict label May 12, 2016
@J0WI

J0WI commented May 12, 2016

Copy link
Copy Markdown
Contributor

This needs to be rebased.

@jeremyn

jeremyn commented Oct 6, 2016

Copy link
Copy Markdown
Contributor

@schmiedecker Are you still interested in working on this?

@schmiedecker

Copy link
Copy Markdown
Contributor Author

Sure, but I fear my git-foo powers have not improved.

Would you be so kind to add the rules & close this pull request?

@jeremyn

jeremyn commented Oct 11, 2016

Copy link
Copy Markdown
Contributor

@schmiedecker We're currently discussing if and when reviewers should directly modify pull requests, see #7242 . But that discussion is still open.

In the meantime, I'm not 100% sure on what triggers it, but when it happens to me, I can sync up (that is, fix) the subproject hashes by rerunning the install-dev-dependencies.sh install process. So I recommend resetting back to the current master branch, rerun install-dev-dependencies.sh, then add your ruleset. Hopefully the git diff will then just have the new ruleset without the subproject hash changes.

@schmiedecker

Copy link
Copy Markdown
Contributor Author

retry with new pull-request, #7358 and no modifications to any other files but the rule file for dji

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants