Hello, I would like to make a change to the git branching model for Freeciv-web. The Freeciv-web git repo can be found here: https://github.com/freeciv/freeciv-web
Today all development happens in the master branch in git and is released from the master branch to production when I have the chance to do it at random time intervals. There are also some other feature-specific branches and the testing branch currently. I would like to change the branching model for Freeciv-web to have a master branch and a develop branch. This is based on "A successful Git branching model", more details here: http://nvie.com/posts/a-successful-git-branching-model/ The master branch should be production-ready and will be deployed to the production server every night automatically, if there are any git changes and the tests pass. The develop branch is where development of new features occurs. There can also be other branches, which would be merged to the develop branch when ready. So in order to deploy to production, simply merge from develop to the master branch, and then the master branch will be deployed to production the coming night. I will implement this change very soon if there are no objections. Regards, Andreas
_______________________________________________ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
