Conversation
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
There was a problem hiding this comment.
Welcome to our repository. 🎊
Thank you so much for taking the time to point this out. Please note that this is the project owner, @MAVRICK-1. I won't be available for 3-4 days and will reply to every PR after May 18. Thank you for your cooperation.
|
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? |
@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? |
@Prutha-Upadhyay, You have to take a pull of recent changes in your current branch into your branch.
-> 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 devNote: This might give a warning to use Fast-forward or Rebase To use Rebase: git pull --rebase upstream dev
Reference commands: To Continue rebase: To abort rebase |
|
@akbatra567 Thank you for your help!!👍 |
|
Resolved that and now My Account Page Screen.Recording.2024-07-01.194442.mp4and 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 |
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