From 6cadb02bfa6e322935830b3390d1d41fc28958de Mon Sep 17 00:00:00 2001 From: Sebastian Zhorel Date: Sat, 7 Dec 2019 16:54:08 +0100 Subject: [PATCH] Update branch description and add GitHub mirror to git.html --- www.freecol.org/documentation/git.html | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/www.freecol.org/documentation/git.html b/www.freecol.org/documentation/git.html index 0d8b8f088..a061e46f4 100644 --- a/www.freecol.org/documentation/git.html +++ b/www.freecol.org/documentation/git.html @@ -85,22 +85,23 @@

Git is the tool we use for storing our source code in a central + href="https://sourceforge.net/p/freecol/git/" title="repo">central location. This system allows everyone to have their own copy of the source code. You can read more about Git at Wikipedia.

If you just wish to take a quick look at the the code, you may use the web-based interface.

Development branches

-
FreeCol no longer normally uses a trunk branch.

We are sometimes developing two versions of FreeCol at the same time: the - main/trunk version and a stable branch. The former will be released as FreeCol x.0 and - will probably be buggy for some time, while the latter is used for creating stable - releases. Usually though only the trunk is being worked on.

+ master version and a stable branch. The former will contain the in development version and + will probably be buggy for some time, while the latter is only updated when creating stable + releases and rarely when preparing bugfixes for next stable release. + Usually, only the master branch is being worked on though.

Download and Build

There are several ways to download a git repository for FreeCol available - here. In order to compile the game + here and at the occasionally updated + mirror. In order to compile the game you will need a Java Virtual Machine version 1.8 or higher and a recent version of Ant.