To clone the repo and start working, use the following commands.
SSH:
git clone -b development [email protected]:ArshavineRoy/doros-wedding-client.git
HTTPS:
git clone https://github.com/ArshavineRoy/doros-wedding-client
Steps on how to do this will be demonstrated on call.
Create a branch for what you are working on. Start branches with an ft- prefix. e.g., ft-login.
git branch <ft-name>
git checkout <your branch>
NOTE: Always confirm the branch you're on at the bottom left corner of your VS Code editor before you start coding.
Steps on how to easily create and switch to a branch in VS Code will be demonstrated on call.
npm start
This will reduce the time taken during code review and also minimize conflicts.
Please make sure to write meaningful commit messages. Describe what you have done.
Messages like "Done"
are not welcome.
git add .
git commit -m "<your message>"
If it's the first time you're pushing to this branch, make sure to set upstream with -u
so you can always use git push
anytime.
git push -u origin <your branch>
For subsequent pushes to the same branch
git push
Steps on how to do this will be demonstrated on call.
Steps on how to do this will be demonstrated on call.
If there are changes in development on GitHub [merged changes will be announced] and you want to have them, switch to development branch in VS Code and run the following command.
NB: Ensure you have committed or pushed all changes in your branch first before pulling changes in development!
git pull
Steps on how to do this will be demonstrated on call.
Steps on how to do this will be demonstrated on call.
git merge origin/development
15. Resolve conflicts in your branch, if any, by "accept all current" or "accept all incoming" changes
Incoming changes are those pulled from GitHub, and current means what you had before starting the merge process. Accept incoming if the new changes are what you want in your code, keep current if you don't want to change your code.
Conflicts are resolved one by one, carefully.
If you have any issues, schedule a call with me.
Happy coding!