From 5eb1ed5da6ae374c6f0be80d2e0ceab84a7f38a3 Mon Sep 17 00:00:00 2001 From: ramnreddy15 Date: Sat, 24 Apr 2021 20:05:03 -0700 Subject: [PATCH] Edits --- .gitignore | 75 +++++++++++++++++++++++++----------------------------- README.md | 7 +---- 2 files changed, 35 insertions(+), 47 deletions(-) diff --git a/.gitignore b/.gitignore index 87bc6c0..2d3f21f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,48 +1,41 @@ -### Hosted gitgnore +# Code editors and IDE files +.vscode/ +.idea/ + +# WSL for Windows +*Zone.Identifier + +# macOS +.DS_Store + +# dependencies node_modules -public -src -studio +/.pnp +.pnp.js -#### Devlopment gitignore -# # Code editors and IDE files -# .vscode/ -# .idea/ +# testing +coverage -# # WSL for Windows -# *Zone.Identifier +# production +build +dist -# # macOS -# .DS_Store +# misc +.DS_Store +.env.local +.env.development.local +.env.test.local +.env.production.local -# # dependencies -# node_modules -# /.pnp -# .pnp.js +# sass +.sass-cache/ +*.css.map +*.sass.map +*.scss.map -# # testing -# coverage +# eslint +.eslintcache -# # production -# build -# dist - -# # misc -# .DS_Store -# .env.local -# .env.development.local -# .env.test.local -# .env.production.local - -# # sass -# .sass-cache/ -# *.css.map -# *.sass.map -# *.scss.map - -# # eslint -# .eslintcache - -# npm-debug.log* -# yarn-debug.log* -# yarn-error.log* +npm-debug.log* +yarn-debug.log* +yarn-error.log* diff --git a/README.md b/README.md index 97d5ccf..a2bfc70 100644 --- a/README.md +++ b/README.md @@ -33,14 +33,9 @@ Make sure to replace "build": "react-scripts build", "test": "react-scripts test", "eject": "react-scripts eject" -``` when creating a branch in the scripts section of package.json - -# Committing to branches -When committing to a side branch make sure to uncomment everything below "Devlopment gitignore" and comment everything under the "Hosted gitignore" heading. +``` when creating a branch. This in the scripts section of package.json # Committing to master -When committing to a master branch make sure to uncomment everything below "Hosted gitignore" and comment everything under the "Devlopment gitignore" heading. - Run ```yarn run build``` in the console Also replace