From 998207fccd06c798481d034b2450ab017c920068 Mon Sep 17 00:00:00 2001 From: "sfoix@maclaplinux" <sfoix@iri.upc.edu> Date: Mon, 19 Dec 2016 22:57:06 +0100 Subject: [PATCH] Updating content --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 58766b7..e2b6d95 100644 --- a/README.md +++ b/README.md @@ -60,10 +60,9 @@ Your *src* folder should look like this: iri_core ``` -Each package belongs to a separate Git repository. By default, there are two branches within each of the repositories: one called **master** and another one called **mock**. Both branches are protected and maintained by IRI (If required, this can be changed). The **master** branch is the one used for *stable* code. The **mock** branch is created in case that the developers want to carry out mock tests. +Each package belongs to a separate Git repository. By default, there are two branches within each of the repositories: one called **master** and another one called **mock**. Both branches are protected and maintained by IRI (Although if required, this can be changed). The **master** branch is the one used for keeping the *stable* version of the code. The **mock** branch is created in case that the developers want to carry out mock tests. -Developers should not push any code directly to these two repositories but into temporal branches or forks instead. Once the code is sufficiently tested within the temp branch, a merge to the corresponding *stable* branch can be requested. +Developers should not push any code directly to these two repositories but into temporal branches or forks instead. Once the code is sufficiently tested within the temporal branch, a merge to the corresponding *stable* branch can be requested. For those that are not familiar with GIT repositories, please have a look to [Git - the simple guide] (http://rogerdudler.github.io/git-guide/) for learning the most used commands, and see [Pro - Git book] (http://book.git-scm.com/) for acquiring a deeper knowledge. -## -- GitLab