Fix issues on #330 #331
Fix issues on #330 #331
Conversation
|
when you change something, please dont make always a new Pull Request, thanks |
|
@hasezoey noted |
|
@naorzr, is there currently a special test for it?, when not its ok |
|
@hasezoey haven't created any special test for it as of now, might create some tests for it later on this week. |
This comment has been minimized.
This comment has been minimized.
|
@naorzr could you then squash your fixup commits, thanks? Update to that: could you resolve the merge conflicts? |
|
@hasezoey squashed and pushed. |
|
@naorzr, sorry but it dosnt seem like you did it right, because the old commits are still there, you know you can rebase with squash and then force-push? and the PR's that fix these audits are already merged |
…its) Squashed commits: [6e6821f] audit fix [580f4db] fix issues that caused tests to fail [9c59b69] return schema and fix generic type [7689d22] change buildPublicSchema to buildSchema, add jsDocs (+3 squashed commits) Squashed commits: [6e6821f] audit fix [580f4db] fix issues that caused tests to fail [9c59b69] return schema and fix generic type
|
@hasezoey should have forced push from begin with, thanks for the tip, it didn't work because i pulled after doing the squashing at the first time.. which resulted in back to square one. As for the package-lock.json, I couldn't resolve these conflicts. it's best to just do an npm i && npm audit fix for the latest branch and use that package-lock. |
No description provided.