search

HackYourFuture-CPH / FP-class11

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

crop_stages_endpoint #94

Closed humayunadilshahzad closed 4 years ago

senner007 commented 4 years ago

This also contains a package-lock without new packages. Please fix that along with the merge conflicts

humayunadilshahzad commented 4 years ago

sure @senner007 ... I can undo the package lock commit like I did last time as u said ... should i pull develop again to fix the merge conflicts or it should be the same way like undoing the commits

senner007 commented 4 years ago

hmm.. this might be difficult because you have several commits with package-lock changes. I think the easy way would be to completely overwrite the package-lock with the one from develop

humayunadilshahzad commented 4 years ago

and that will fix merge conflicts as well or do we need to some other process

senner007 commented 4 years ago

That will remove the conflict with that file only

senner007 commented 4 years ago

Next step is to pull develop and merge develop into your branch

humayunadilshahzad commented 4 years ago

thanx Niels ...

senner008 commented 4 years ago

@humayunadilshahzad You still need to overwrite the package-lock file with the one from develop. Simply copy and paste it in

senner008 commented 4 years ago

or git checkout develop package-lock.json

aleksd-dfds commented 4 years ago

@humayunadilshahzad can you implement changes and merge?

dpfernandes commented 4 years ago

Approved