Freeciv-web now has two important branches in Git: master and develop.
The develop branch is where new features are developed, while the master branch is production-ready and automatically built on the live server each night if there are updates. So please submit development updates to the develop branch. Once the develop branch is ready for release, then the develop branch is merged to master, and the server will automatically update the following night.
This is based on http://nvie.com/posts/a-successful-git-branching-model/.