Merge branch 'master' of ssh://www.climate.be:3022/TECLIM/Git_Training

project/windows/branches/README.md

@@ -4,17 +4,12 @@ Branching means you diverge from the main line of development and continue to do
 
 ## Exercise 5 – Create branch in Git_Training project
 
-Go to the terminal opened in your workstation and 'cd' to the location where you cloned the project.
+Branches are very useful when many people are working on the same project. Such cases are premises for lots and lots of conflicts. With branches the developers have the possibility to work on separate parts of the project without causing conflicts. When one developer finishes the feature that they are working on – the branch can be merged with the main one.
 
-```
-cd Git_Training
-```
+Create the new branch checking off from “master” branch (Here the branch name is: develop).
 
-Create the new branch checking off from “master” branch.
+|||
+| -------- | -------- |
+| ![Git-Bash-13.png](https://www.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/13.png) | ![Git-Bash-14.png](https://www.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/14.png) |
 
-```
-git branch branch_name
-git checkout branch_name
-```
-
-`<branch_name>` could be the name of the language you are working on (e.g. greetings_catalan).
+`<branch_name>` could be the name of the PC you are working on.

project/windows/working_environment/README.md

@@ -31,21 +31,16 @@ Git clone allows you to specify parameters such as the target folder. If you don
 Hidden inside a 'working copy' resulting from a git clone there is a special '.git' directory that contains internal objects needed by git.
 
 ```
-pbarriat@elixir:~/tmp/Git_Training> ls .git/
 branches  description  hooks  info  objects      refs
 config    HEAD         index  logs  packed-refs
 ```
 
 It is hidden because you are not supposed to worry at all of internals of '.git'. When you type regular git commands like those in this tutorial, git, transparently writes stuff like indices, references, branch information there.
 
-When you are in a working copy you can use regular unix-like commands such as ls, touch, cp, vi, etc. Additionally you can use whatever git commands, for instance:
+When you are in a working copy you can use regular windows operations such as create file/folder, copy/paste, etc. Additionally you can use whatever git commands.
 
 #### git status
 
-```
-git status
-```
-
 The outputs tells you in what branch you are on. By default (if you have not specified in the clone) it clones the master branch.
 
 On branch master
@@ -77,11 +72,11 @@ Date:   Thu Dec 3 19:04:16 2015 +0100
 
 ## Exercise 3 – Basics operation
 
-### Make some changes new-file.txt
+#### Make some changes new-file.txt
 
 ![9.png](https://www.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/9.png)
 
-### Commit your local changes to your local repository
+#### Commit your local changes to your local repository
 
 Click with the right mouse button and click on “Git Commit”
 
@@ -92,18 +87,21 @@ You should see the following window:
 ![11.png](https://www.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/11.png)
 
 In the message section, write a short summary of your commit. It is good practice to always have meaningful messages. Do not forget to add your files in the bottom part of the window. 
-When you are done with these steps, you can click on [Commit] and you should see the following window:
+
+When you are done with these steps, you can click on `[Commit]` and you should see the following window:
 
 ![12.png](https://www.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/12.png)
 
-In this window, you can see how many files were changed and how many insertions and/or deletions were made. If you are satisfied with the information just click on [Push].
+In this window, you can see how many files were changed and how many insertions and/or deletions were made. If you are satisfied with the information just click on `[Push]`.
 
-### Push your changes to the remote repository in GitHub
+#### Push your changes to the remote repository in GitHub
 
 ![13.png](https://www.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/13.png)
 
-In this window, you can manage to which branch you are pushing your files, but we will talk about branches later in the exercise. For now, just click on [OK] and your file will be pushed to the master branch.
+In this window, you can manage to which branch you are pushing your files, but we will talk about branches later in the exercise. For now, just click on `[OK]` and your file will be pushed to the master branch.
+
+#### Check whether your changes are online
 
-### Check whether your changes are online:
+Open your GitHub repository in your browser and click on new-file.txt. In there you should see the content, which you have written. 
 
-Open your GitHub repository in your browser and click on new-file.txt. In there you should see the content, which you have written. On the last screenshot, you can see the commit message is written in the second column of the commit you have made. You can use this column to get more information about which files were changed and what has been changed. That’s why it’s always good practice to write meaningful commit messages.
+You can see the commit message is written in the second column of the commit you have made. You can use this column to get more information about which files were changed and what has been changed. That’s why it’s always good practice to write meaningful commit messages.