diff --git a/.gitignore b/.gitignore index da240881..67830276 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,5 @@ firebase-debug.log* .eslintcache .npm + +.vercel diff --git a/package.json b/package.json index 5b7f253b..a1d05b50 100644 --- a/package.json +++ b/package.json @@ -70,6 +70,7 @@ "yup": "^0.32.9" }, "scripts": { + "upstream": "git fetch upstream;git merge upstream/v2;git push", "serve": "serve -s build", "start": "craco start", "build": "craco build",