From baad29c26d6e765c7c98df9d77a58dc083036d58 Mon Sep 17 00:00:00 2001
From: Marco Biasini <marco.biasini@unibas.ch>
Date: Fri, 25 Feb 2011 11:45:49 +0100
Subject: [PATCH] added blurps about "picking the right branch" and "updating
 the source code" to installation instructions

---
 modules/doc/install.rst | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/modules/doc/install.rst b/modules/doc/install.rst
index 0c415c5fb..ae1692745 100644
--- a/modules/doc/install.rst
+++ b/modules/doc/install.rst
@@ -81,6 +81,16 @@ The above command will clone OpenStructre into the directory called `directory-n
     git config --global http.sslVerify false
 
 
+Picking the right branch
+--------------------------------------------------------------------------------
+
+By default you are checking out the master branch. Master is, by definition a stable branch. It always points to the latest release. However, there are several other branches at your disposal. The main development is happening in the develop branch. It contains the newest features and bug fixes. However, we dont't make any guarantees that the develop branch is bug free and doesn't contain major bugs. After all, it's in constant flux. If you are developing new features, start your feature branch off develop. Besides that, there are several smaller features branches that are used to group together commits for one specific features. To change to a specific branch, use
+
+.. code-block:: bash
+
+  git checkout <branch-name>
+
+
 Configuring
 --------------------------------------------------------------------------------
 
@@ -172,7 +182,6 @@ run multiple jobs at once.
 On Windows run 'Build OpenStructure' from the build menu.
 
 
-
 What's next?
 --------------------------------------------------------------------------------
 
@@ -189,3 +198,14 @@ or, to start the command-line interpreter:
   stage/bin/ost
   
 If you repeatedly use OpenStructure, it is recommended to add /path/to/dng/stage/bin to your path.
+
+Getting the newest changes
+--------------------------------------------------------------------------------
+
+To get the newest changes from the central git repository, enter
+
+.. code-block:: bash
+
+  git pull
+
+in your terminal. This will fetch the newest changes.
\ No newline at end of file
-- 
GitLab