Merge pull request #24 from nextstrain/git-subrepo-force

README: Update `git subrepo pull` with `--force` flag
nextstrain · Oct 3, 2023 · 7617c39 · 7617c39
2 parents c02fa81 + fb8b17d
commit 7617c39
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -25,6 +25,13 @@ Any future updates of ingest scripts can be pulled in with:
 git subrepo pull ingest/vendored
 ```
 
+If you run into merge conflicts and would like to pull in a fresh copy of the
+latest ingest scripts, pull with the `--force` flag:
+
+```
+git subrepo pull ingest/vendored --force
+```
+
 > **Warning**
 > Beware of rebasing/dropping the parent commit of a `git subrepo` update