HackYourFuture-CPH / FP-class11

Class11 Final Project - A collaboration between HYF and Seasony
MIT License
5 stars 8 forks source link

Feature/loader component #153

Closed humayunadilshahzad closed 4 years ago

senner008 commented 4 years ago

@humayunadilshahzad If no new packages are introduced then package-lock should not be committed either

humayunadilshahzad commented 4 years ago

Hi Niels .. actually my storybook was not running I did new pull and did npm install ... which modified package-lock.json .. thats y i commited it .. Is it not needed to commit ?

senner008 commented 4 years ago

No you should not commit it. You need to run your install using the one from develop

senner008 commented 4 years ago

You can try to undo your commits or create a new branch

humayunadilshahzad commented 4 years ago

thats what I was thing ... can I remove a specific commit or it has to be in reverse order .. I guess I can undo any commit .. yes ?

senner008 commented 4 years ago

https://stackoverflow.com/questions/22682870/git-undo-pushed-commits

senner008 commented 4 years ago

Alternatively just overwrite your package-lock with the one from develop and push that commit

humayunadilshahzad commented 4 years ago

Niels I have reverted it locally . I did " git revert 0184a40c7fabd951c94c5f789302f032d0f0f09d " it says [feature/loader-component 96d2f6d] Revert "packages updated" 1 file changed, 69 insertions(+), 23 deletions(-) .. documentation says .. revert commit ... is a new commit .. do I need to push it again ?

senner008 commented 4 years ago

Yes, push the commit

senner008 commented 4 years ago

That did the trick 👍

humayunadilshahzad commented 4 years ago

Thanx Niels

cecastosic commented 4 years ago

Great job @humayunadilshahzad 💪

senner007 commented 4 years ago

@cecastosic @humayunadilshahzad Is it ready for merge?

humayunadilshahzad commented 4 years ago

Thanx .. @cecastosic .. @senner007 and Yes I hope so its complete .