Hopefully one time steps:
-
Fork the repo
-
Clone your fork to your local machine
git clone https://github.com/**yourAcctName**/DrivewayShare.git
- Add an upstream that points to the main repo
git remote add upstream https://github.com/ThortyTwo/DrivewayShare.git
- Install npm and bower dependencies
npm install
Steps that are repeated:
- Update/sync your local code with the code from the main repo
git pull --rebase upstream dev
-
Reinstall npm and bower dependencies if necessary.
-
Create a new branch for your contribution
git checkout -b branchName
- Write your code, then add your changes
git add yourFile
- Commit your changes, with a message (see below for guide to commit messages)
git commit -m "[type] description of commit"
- Re-update/re-sync your local code with the code from the main repo
git pull --rebase upstream dev
-
Resolve any conflicts and commit again if neccessary
-
Push to your origin (your forked copy)
git push origin branchName
- Open a pull request
Branch Names: please use type/description with camel-casing
feature/logoutButton
Commit Messages: please use [Type] Description with first letter of type capitalized. Description should have proper punctuation/capitalization and be in past tense.
[Feature] Added button that allows user to logout
Possible types include: setup, feature, refactor, bugfix