diff --git a/update-from-template b/update-from-template new file mode 100755 index 0000000..2b3a235 --- /dev/null +++ b/update-from-template @@ -0,0 +1,6 @@ +#!/bin/bash + +git fetch https://github.com/USThing/template-api.git main # fetches to `FETCH_HEAD` +git merge FETCH_HEAD -m "chore(template): update from upstream" + +echo "Note: Merge conflicts of yarn.lock can be automatically resolved by running \"yarn\" after resolving the conflicts in package.json."