Repository navigation
created rule for dji.com - #4368
schmiedecker wants to merge 1 commit into
Conversation
|
Thanks for the PR. It looks like your git submodules are out of sync with those in the master branch; try running a |
|
'done, has not changed anything? Could you explain the issue a bit? Thx ... |
|
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. |
|
This needs to be rebased. |
|
@schmiedecker Are you still interested in working on this? |
|
Sure, but I fear my git-foo powers have not improved. Would you be so kind to add the rules & close this pull request? |
|
@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 |
|
retry with new pull-request, #7358 and no modifications to any other files but the rule file for dji |
No description provided.