Conversation
|
Also, I was trying to fix the merge conflicts, but it says that I made something like 22 thousand changes to package-lock.json but I didn't anything that would cause this, so I'm going to hold off on fixing the conflicts until I figure out what happened. |
jpoist97
left a comment
jpoist97
left a comment
There was a problem hiding this comment.
Code looks good! Just have one question about Select announcement which I think might need to be changed a little bit. As for the package-lock I think you might be able to just delete it and your node_modules and run npm i again and hopefully it will go back to how it was before.
jpoist97
left a comment
jpoist97
left a comment
There was a problem hiding this comment.
Looks good to me, looks like you have a conflict w the package-lock though.
|
@jpoist97 Yeah I'm really not sure what's going on there. I tried to remove the package-lock.json file and reinstall it with npm i but that didn't seem to fix it and actually goes into an infinite loop when trying to reinstall the modules. Do you have any other ideas on what could be the issue? Is it possible to merge it without the package-lock.json? |
Maybe try running |
|
Ok tried that but now I think my whole thing is corrupted because I can't run npm start or get the site up. Very strange. |
3 participants
Created the announcement reducers and test cases for them as well. All tests pass. The only one that may need to be revised is the select announcement functionality because I wasn't really sure how to do that with redux.