Which branch do I use?
-
master
features the latest release of the game and should compile without warnings on all supported systems. -
next
features code that will be included in the next release, and is therefore a work in progress. Once the next version of the game is released,next
will be merged intomaster
.
Unless you are just making changes to the compiling process (this does not include source code refactoring), merge requests should be targetted at next
or a feature branch that will eventually be merged into next
.
If you are making changes to the compiling process, such as tweaking the Makefile or addressing compiler warnings, you should target your merge request at master
.