There are two repos:
The development uses staging repo, master branch.
To sync the two repos, you need to add the following to the config of the live repo:
[remote "staging"]
url = git@github.com:associazionepoltronieri/associazionepoltronieri.github.com.git
fetch = +refs/heads/*:refs/remotes/origin/*
When you need to sync the live repo with the staging one, you need to execute the following commands:
git pull staging master
git push
The live repo has two branches: master
and gh-pages
.
After syncing staging master branch with live master one, the last step to go live is to merge live master branch with live gh-pages one.