Closed LeviButcher closed 4 years ago
You can play this version of the game here
Built with commit 4ca5487b2cb16de549244846f433293e36105fcf
@itaditya I've updated my branch to resolve conflicts with master. I forced push to prevent from creating many commits.
I realized the format command isn't running on the tests directory. Would it be okay to change it to "prettier --write src/* src/*/"?
That's a good catch @LeviButcher. Ideally a PR should focus only on one thing. Since prettier formatting is different from your work.
But for now, you can make the prettier change.
@itaditya I've updated my branch with latest changes. The format command was breaking trying to format the mp3 file so I changed it to match only .js. But that's not a very good solution since we probably want css files formatted as well.
I can add in a css file match but want to make sure your fine with that and if there are any other patterns we should match on.
@LeviButcher prettier has the option to ignore files as well. See this https://prettier.io/docs/en/ignore.html#ignoring-files
So we can say ignore mp3 file via .prettierignore file
@itaditya Good to go. :+1:
Can you run these commands-
git pull upstream master # get the latest code of my master in your fork's branch
npm install # install the dependencies so it auto-generates correct package-lock.json
This will automatically fix the merge conflicts.
Congrats @LeviButcher
As requested in #59
Let me know of anything else needed for this merge.