Feat : UI Changes in the Sign In page #265
Conversation
|
Hello there!👋 Welcome to the project!💖 Thank you and congrats🎉 for opening your first pull request.✨ AnitaB.org is an inclusive community, committed to creating a safe and positive environment.🌸Please adhere to our Code of Conduct and Contribution Guidelines.🙌.We will get back to you as soon as we can.😄 Feel free to join us on AnitaB.org Open Source Zulip Community.💖 We have different streams for each active repository for discussions.✨ Hope you have a great time there!😄 |
|
@reachaadrika can you please resolve the conflict. You can refer to this link. And please remove |
| <div className="row"> | ||
| <label>Not yet registered? Click on sign up.</label> | ||
| <label>Dont have an Account? Sign Up.</label> |
There was a problem hiding this comment.
Yes Sure @stableapple
Also can you please tell me how to remove package.json?
There was a problem hiding this comment.
Can you please tell me how to do I commit latest code to this pull request only ?
There was a problem hiding this comment.
To remove the package-lock.json you can do git reset --soft HEAD~1 and then git rm package-lock.json. To resolve the conflict, that is to merge the latest code from the master branch(develop) to your new branch that you are currently working in, you will have to change to the new branch by doing git checkout new_branch. Then set upstream by git remote add upstream https://github.com/anitab-org/bridge-in-tech-web.git followed by git pull upstream develop
There was a problem hiding this comment.
Thanks a lot
git pull upstream develop
From https://github.com/anitab-org/bridge-in-tech-web
- branch develop -> FETCH_HEAD
Already up to date.
This is what I am getting
|
@reachaadrika footer and show password is missing. Please add them too. |
|
Yes sure @aakankshaagr , please tell me once how to commit the latest code in this PR , I am facing some issues |
|
sure @reachaadrika
|
|
Thank you so much @aakankshaagr |
|
If you are facing issue using the command line, you can resolve the conflicts using the web editor by clicking on the |
|
@stableapple Noted , Should I make a new PR? |
@reachaadrika , yes please 😉 |
|
@mtreacy002 Sure , I will close this PR and make a new one |
Description
Fixes #249
Type of Change:
Code
Code/Quality Assurance Only
New feature (non-breaking change which adds functionality pre-approved by mentors)
How Has This Been Tested?
Checklist:
Code/Quality Assurance Only