This project is generated with yo angular generator version 0.16.0.
Run grunt
for building and grunt serve
for preview.
Running grunt test
will run the unit tests with karma.
git clone ...
cd GameStore.UI.Repo
git checkout -b [[author-feature-versionNumber]]
git push -u origin [[author-feature-versionNumber]]
npm install && bower install
- make sure you installed everything on this page:
npm install -g grunt-cli bower yo generator-karma generator-angular
gem install compass
- start coding / editing
git status
:- make sure you see your editings, and your not on the
master
branch.
- make sure you see your editings, and your not on the
git add .
git commit -m "[[commit message...]]"
git push
- your buddy needs to create PR (pull request) - Base:
master
- Compare:buddy-branch-example-0
- review this PR
- Approove this PR
- Merge this PR
- your buddy code now on mster!
- YOU:
cd
to your repository by bash terminalgit pull origin master --ff-only
- this will try to get the code from master
- case fail: you need to solve merge conflicts!
- case success: your local branch now has the code of your buddy too! so commit & push.
google it.
(or ask me if i have time..)