README.md

gmarena.github.io

Secret Project for GA using HarpJS

gracemarie.xyz

##Work Flow

dev is the default branch for this repository. master is the production branch.

Development

git pull
git checkout -b <new_branch_name>

(Make the branch name relevant to the task you are engaging in)

harp server _gracemarie

• This starts the auto-compile and regeneration of partials etc
• Server automatically uses localhost port 9000

When you're happy with the updates you've made, commit the changes.

Next: merge the feature branch with dev.

Production

git checkout master
git merge dev

harp compile _gracemarie/ ./

git add --all .
git commit -m "[commit message]"
git push

• This will remove README.md
• NEVER compile on dev Seriously, only ever compile on master. ONLY ON MASTER