diff --git a/README.md b/README.md index 008ec43..fa91891 100644 --- 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