I have a website using git
The setup has the master branch as the live site and a develop branch as the dev domain which is used for testing features before they go
If you don't care about preserving develop just checkout develop
and reset it to master
.
# make sure master is up to date before you do this
git checkout develop
git reset --hard master
git push -f # force push the branch
This is often done for an integration
branch every morning, so that the nightly integration is always based on master.