Merged
Conversation
The last reference was removed in 8b11a7a.
The last reference was removed in 53f0296.
Something funny happened where 7e0ea00 was rebased as-is (instead of re-applying), so the parent commit in git subrepo's internal file was not referencing something on the default branch. This caused `git subrepo pull` to not work. Manually editing the internal file so that `git subrepo pull` can work again.
subrepo: subdir: "ingest/vendored" merged: "c97df23" upstream: origin: "https://github.com/nextstrain/ingest" branch: "main" commit: "c97df23" git-subrepo: version: "0.4.6" origin: "https://github.com/ingydotnet/git-subrepo" commit: "110b9eb"
subrepo: subdir: "ingest/vendored" merged: "c02fa81" upstream: origin: "https://github.com/nextstrain/ingest" branch: "main" commit: "c02fa81" git-subrepo: version: "0.4.6" origin: "https://github.com/ingydotnet/git-subrepo" commit: "110b9eb"
2 tasks
Contributor
|
Ah, just realized the last sync I did in d0e00ab pulls in |
Contributor
|
Waiting on trial run of ingest Edit: Trial run completed successfully and uploaded outputs to |
Contributor
|
Merging since the trial run worked as expected. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of proposed changes
There are new scripts in nextstrain/ingest. I did a quick check and none of them are used in this repo. Doesn't hurt to pull them in anyways.
Related issue(s)
Checklist