Update branch description and add GitHub mirror to git.html

This commit is contained in:
Sebastian Zhorel 2019-12-07 16:54:08 +01:00
parent 097bc172db
commit 6cadb02bfa
1 changed files with 7 additions and 6 deletions

View File

@ -85,22 +85,23 @@
<tr>
<td valign="top" colspan="2">
<p align="justify">Git is the tool we use for storing our source code in a&nbsp;<a
href="https://sourceforge.net/p/freecol/git/ci/master/tree/" title="repo">central
href="https://sourceforge.net/p/freecol/git/" title="repo">central
location</a>. This system allows everyone to have their own copy of the source code.
You can <a href="http://en.wikipedia.org/wiki/Git_(software)">read more about Git</a> at
Wikipedia. <br/><br/> If you just wish to take a quick look at the the code, you may use
the <a href="https://sourceforge.net/p/freecol/git/">web-based interface</a>.
</p>
<h4>Development branches</h4>
<div class="warningbox">FreeCol no longer normally uses a trunk branch.</div>
<p align="justify">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.</p>
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.</p>
<h4>Download
and Build</h4>
<p align="justify">There are several ways to download a git repository for FreeCol available
<a href="https://sourceforge.net/p/freecol/git/">here</a>. In order to compile the game
<a href="https://sourceforge.net/p/freecol/git/">here</a> and at the occasionally updated
<a href="https://github.com/FreeCol/freecol">mirror</a>. In order to compile the game
you will need a <strong>Java Virtual Machine version 1.8 or higher</strong> and a recent
version of <a href="http://ant.apache.org">Ant</a>.</p>
</td>