Repository for our DGM 2015-2016 Senior Project.
npm install
to install dependencies from package.jsonbower install
to install dependencies from bower.jsongulp watch
in your console to serve up the project on localhost:8000
Just a quick overview/cheatsheet on how we should handle the version control on this project.
git clone https://github.com/<your username>/DebtFreeLiving.git
git remote add upstream https://github.com/tsorensen/DebtFreeLiving.git
git remote -v
. More info here.You should now be set. You can make all the changes/additions you need to on your local copy. You can also update your local copy at anytime (if you see new commits come through on the main repo in Slack) by fetching the upstream (see below).
When you're ready to commit changes, make sure to fetch the upstream first.
git fetch upstream
. git checkout master
.git merge upstream/master
. This makes sure your copy is up to date on the latest commit in the main repo. If you have conflicts, you need to resolve them before pushing your own commits (it will tell you if you have conflicts when you do the merge command). If you need help resolving conflicts just let me know.git status
).git add <filename>
or to add all git add .
, commit git commit -m"your comment"
, and push git push
You should now be able to check your own repo on GitHub.com and see your commits there.
After you have made all the changes/additions you want on a page or feature, submit them to be merged to the main repo.
Once the pull request is complete, I'll see it and merge it into the main repo master branch.