Open Prutha-Upadhyay opened 3 months ago
The latest updates on your projects. Learn more about Vercel for Git ↗︎
Name | Status | Preview | Comments | Updated (UTC) |
---|---|---|---|---|
nest-ondc | ❌ Failed (Inspect) | Jul 6, 2024 7:47am | ||
nest-ondc-arzx | ❌ Failed (Inspect) | Jul 6, 2024 7:47am |
please check this!
@Prutha-Upadhyay MyAccount page is not created .
@MAVRICK-1,Now please check this!
it has conflicts in yarn.lock file please solve that @Prutha-Upadhyay
@Sahilll15 Can you help me out where is the conflict? How to solve it?
@Sahilll15 Can you help me out where is the conflict? How to solve it?
@Prutha-Upadhyay, I can help if you're still looking for help in resolving conflict.
@akbatra567 Yes please, I tried it so many times but I am enable to find where is the exact problem and how to solve it?
@akbatra567 Yes please, I tried it so many times but I am enable to find where is the exact problem and how to solve it?
@Prutha-Upadhyay, You have to take a pull of recent changes in your current branch into your branch. One such way is
-> using ssh
git remote add upstream git@github.com:MAVRICK-1/Nest-Ondc.git
-> using https
git remote add upstream https://github.com/MAVRICK-1/Nest-Ondc.git
git pull upstream dev
Note: This might give a warning to use Fast-forward or Rebase
To use Rebase:
git pull --rebase upstream dev
git status
and follow the steps mentioned.Reference commands:
To Continue rebase:
git rebase --continue
To abort rebase
git rebase --abort
@akbatra567 Thank you for your help!!👍
Resolved that and now My Account Page
https://github.com/MAVRICK-1/Nest-Ondc/assets/120392487/613bbf01-0c87-4a29-bba3-887b488380c4
and also change Email format because it is replacing . to _ and stored wrong email address.....! @akbatra567 please kindly review this!!
Resolved that and now My Account Page
Screen.Recording.2024-07-01.194442.mp4 and also change Email format because it is replacing . to _ and stored wrong email address.....! @akbatra567 please kindly review this!!
Looks fine, Just a look query. Have you added any new packages or upgraded any package ? @Prutha-Upadhyay
Resolved that and now My Account Page Screen.Recording.2024-07-01.194442.mp4 and also change Email format because it is replacing . to _ and stored wrong email address.....! @akbatra567 please kindly review this!!
Looks fine, Just a look query. Have you added any new packages or upgraded any package ? @Prutha-Upadhyay
No, I did not!
Resolved that and now My Account Page Screen.Recording.2024-07-01.194442.mp4 and also change Email format because it is replacing . to _ and stored wrong email address.....! @akbatra567 please kindly review this!!
Looks fine, Just a look query. Have you added any new packages or upgraded any package ? @Prutha-Upadhyay
No, I did not!
Then, could you remove package-lock.json
and yarn.lock
Resolved that and now My Account Page Screen.Recording.2024-07-01.194442.mp4 and also change Email format because it is replacing . to _ and stored wrong email address.....! @akbatra567 please kindly review this!!
Looks fine, Just a look query. Have you added any new packages or upgraded any package ? @Prutha-Upadhyay
No, I did not!
Then, could you remove
package-lock.json
andyarn.lock
But I have added one dependency fsevents in yarn file, so is it safe to remove yarn file?
Resolved that and now My Account Page Screen.Recording.2024-07-01.194442.mp4 and also change Email format because it is replacing . to _ and stored wrong email address.....! @akbatra567 please kindly review this!!
Looks fine, Just a look query. Have you added any new packages or upgraded any package ? @Prutha-Upadhyay
No, I did not!
Then, could you remove
package-lock.json
andyarn.lock
But I have added one dependency fsevents in yarn file, so is it safe to remove yarn file?
If you've added a new package it should also be in package.json file, just verify if you are upgrading the version of any package and mention the same in the PR description.
Okay, I am removing both files!
@MAVRICK-1, Would need some help here to see the logs on vercel, as I can't see on my end. Need to identify the cause of checks falling.
67 Implemented My Account page -->
Screenshots (if appropriate):
Types of changes