Closed Utsavladia closed 2 weeks ago
The latest updates on your projects. Learn more about Vercel for Git ↗︎
Name | Status | Preview | Comments | Updated (UTC) |
---|---|---|---|---|
pop-shop | ✅ Ready (Inspect) | Visit Preview | 💬 Add feedback | Jun 17, 2024 3:29pm |
Fix the build errors. Verify with npm run build
@Utsavladia
There are conflicts. Fix them. And lmk when are you free tomorrow, there are lot of issues that needs to be covered. @Utsavladia
@pooranjoyb I have resolved the conflicts. And I am free till 2pm.
Okay try to fix this now. @Utsavladia
Okay try to fix this now. @Utsavladia
@Utsavladia try to work upon this, also there are merge conflicts take a pull from dev
and then start working
@Mahitej28 @pooranjoyb
Fixed the Nav links in updated floating navbar and undefined section of dropdown.
Bruh, please remove use Conditional rendering for Login and Logout. Obviously how will a user Logout without Login? @Utsavladia
Fix the conflicts. @Utsavladia
@Utsavladia your pr has merge conflicts, resolve that and take a pull from dev
before pushing commits.
Hii @Utsavladia please check the build errors. run npm run build
in your local machine and debug accordingly. :)
@pooranjoyb sure, Resolved the conflicts and debugged the build error.
@Utsavladia I can still see merge conflicts resolve it first, your Navbar.tsx
file has 4 merge conflicts resolve that and before that take a pull from dev
@Mahitej28 I hope it is fixed now Please let me know if any changes required.
merge conflicts :/ @Utsavladia
Closing as inactive.
@pooranjoyb Sir, I kept resolving the conflicts again and again but due to delay in merging the branch new conflicts used to come and now also I could have resolved it I dont know how this notification got missed. sir I have spent time on this issue I request you to kindly let me fix and make it a successfull merge.
Okay @Mahitej28 & @AjayAsnani will check and respond accordingly.
@Utsavladia will give you two days time to complete it.
@pooranjoyb @Mahitej28 Resolved the conflicts and synced with the latest branch I hope now it is working perfectly fine..
@Mahitej28 Mam this merge did not get counted in my contributions to GSSoC. I think you will also have to assign this pulll request to me so that it gets counted 😊
@Mahitej28 Mam this merge did not get counted in my contributions to GSSoC. I think you will also have to assign this pulll request to me so that it gets counted 😊
Wait for 24 hours, it takes time to update.
Please include a summary of the changes and the related issue. Please also include relevant motivation and context. List any dependencies that are required for this change.
Fixes #169
Type of change
Please give a X on it which is applicable
How Has This Been Tested?
Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
Test A Describe here Tested by going to all the routes.
Test B Describe here (if Requred)
Screenshorts and Vedios:
give screenshorts and vedio of the changes you made
Checklist:
give a X on it which is applicable