User profile page

[nobel10122025]

1 . Created a User Profile Page 2 . Created a readme for client folder

[vercel[bot]]

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Updated
memories-app	✅ Ready (Inspect)	Visit Preview	Aug 14, 2022 at 1:14PM (UTC)
memories-app-server	✅ Ready (Inspect)	Visit Preview	Aug 14, 2022 at 1:14PM (UTC)

[shreya024]

@nobel10122025 Resolve the conflicts

[nobel10122025]

@nobel10122025 Resolve the conflicts

can you please help me by saying does this issue still persist or should i create a new PR with my main branch this is my first contribution so i am not getting why this conflict has araised. Sorry

[soumali28]

@nobel10122025 just pull the changes before you push it the conflicts will be resolved

[nobel10122025]

@soumali28 i guess i have already done that. But how to check if the conflict still exist!

[soumali28]

see in the bottom where the git symbol is it showing the branch has conflicts and also shows the conflicting files

[nobel10122025]

i think it doesn't have any conflicts now

@soumali28 please let me know if this is fine or ?

[soumali28]

not in the vs code I meant in github in the pr right here

[nobel10122025]

@soumali28 can i create a new PR ? i dont know what to do now. i have tried things but that message is not changing:((

[soumali28]

Ok close this pr and make a new one and before pushing the code make sure to pull it.

[nobel10122025]

I am closing this PR because i am not able to Resolve this Conflict. Will create a new one from the master branch.