Freeciv-web branches and automatic updates

Web version of freeciv at play.freeciv.org
User avatar
AndreasR
Elite
Posts: 701
Joined: Thu May 02, 2013 10:26 pm
Location: Norway

Freeciv-web branches and automatic updates

Postby AndreasR » Sat Aug 13, 2016 9:39 am

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/.