Pierre-Yves Barriat 7 jaren geleden
bovenliggende
commit
e84f10e48c

+ 7 - 7
project/windows/README.md

@@ -5,10 +5,10 @@ It is very simple, only consists in a couple of files written in bash and you wi
 
 In this tutorial you will learn how to make commits in the Git project, to create several branches, to push things to Gogs, and to follow a standard procedure to develop collaboratively. Afterwards, you should apply the same methods to any other collaborative development inside the ELIC department. The objectives will be achieved gradually following these topics:
 
-1.     [Set up your working environment](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux/working_environment)
-2.     [Prepare issues on Gogs](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux/gogs_issues)
-3.     [Prepare branches](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux/branches)
-4.     [Add new functions](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux/functions)
-5.     [Create pull request](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux/pull_request)
-6.     [Review and test others' branches](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux/review)
-7.     [Pull master changes](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux/pull_master)
+1.     [Set up your working environment](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/working_environment)
+2.     [Prepare issues on Gogs](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/gogs_issues)
+3.     [Prepare branches](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/branches)
+4.     [Add new functions](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/functions)
+5.     [Create pull request](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/pull_request)
+6.     [Review and test others' branches](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/review)
+7.     [Pull master changes](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/pull_master)

+ 1 - 1
project/windows/branching-website.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <link href="css/styles.css" rel="stylesheet" type="text/css">
+    <link href="styles.css" rel="stylesheet" type="text/css">
     <title> Branching Practice Site </title>
   </head>
   <body>

+ 1 - 1
project/windows/functions/README.md

@@ -24,7 +24,7 @@ git commit -m "message explaining what you have done. Fixes issue #issue_number"
 
 When we run `git commit`, Git takes everything we have told it to save by using `git add` and stores a copy permanently inside the special `.git` directory. This permanent copy is called a commit (or revision) and its short identifier is `f22b25e` (Your commit may have another identifier.)
 
-You can do as many commits as you wish while developing your function. If you reach a point at which any of the open issues gets solved, you can make your commit message end with `Fixes #issue_number` ([Exercise 4 – Open new issue in Git_Training project](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux/gogs_issues)).
+You can do as many commits as you wish while developing your function. If you reach a point at which any of the open issues gets solved, you can make your commit message end with `Fixes #issue_number` ([Exercise 4 – Open new issue in Git_Training project](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/gogs_issues)).
 
 If you don't specify the `-m` parameter a text editor will open automatically to allow you to write the commit message.
 

+ 1 - 1
project/windows/pull_master/README.md

@@ -4,7 +4,7 @@ Once the project coordinator has accepted all pull requests, there is a new vers
 
 ## Exercise 13 - Update master branch
 
-Following instruction from [Exercise 10 – Checkout a branch from Git_Training project](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux/review), checkout the master branch.
+Following instruction from [Exercise 10 – Checkout a branch from Git_Training project](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/review), checkout the master branch.
 
 ```
 git checkout master

+ 12 - 29
project/windows/working_environment/README.md

@@ -1,49 +1,32 @@
 # Set up your working environment
-## Exercise 1 – Git global configuration
-
-First of all you will have to configure git locally in your laptop:
 
-> Of course, you must have git installed. With ubuntu: **sudo apt-get install git**
+## Exercise 1 – Git global configuration
 
-Open a terminal and run the following git global commands (put your name and email):
+First of all you will have to configure git locally in your desktop:
 
-```
-git config --global user.name "My name"
-git config --global user.email "my_mail@uclouvain.be"
-git config --global color.ui auto
-git config --global core.editor "vim"
-git config --global push.default simple
-```
+You must have git installed. See the instructions [here](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/resources/README.md)
 
-## Exercise 2 – Gogs configuration
+## Exercise 2 – Github configuration
 
-If it is the first time you try to enter in Gogs click on “Sign-in” and use your classical ELIC login.
+Go to [https://github.com/](https://github.com/) and "Sign-in".
 
-After completing this step you will need to ask access to the repositories you want. Send an email to the Gogs administrators of this (these) project(s) asking access to.
+After completing this step you will need to ask access to the repositories you want. Send an email to the administrators of this (these) project(s) asking access to.
 
 ## Exercise 3 – Clone into a working environment
 
-To start working you need to create a clone, called afterward “working copy” of the git_tutorial project from Gitlab in your home (or folder of your choice):
+To start working you need to create a clone, called afterward “working copy” of the git_tutorial project from Github in your home (or folder of your choice):
 
-```
-git clone ssh://git@www.climate.be:3022/TECLIM/Git_Training.git
-```
+For instance, paste the URL into TortoiseGit and it will clone the repo locally on your computer:
+
+![6.png](https://www.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/6.png)
 
 It will ask for your username and password and you will see output like this:
 
-```
-Cloning into 'Git_Training'...
-remote: Counting objects: 3, done.
-remote: Total 3 (delta 0), reused 0 (delta 0)
-Unpacking objects: 100% (3/3), done.
-Checking connectivity... done.
-```
+![7.png](https://www.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/7.png)
 
 It has created a 'Git_Training' folder and you can browse into it:
 
-```
-cd Git_Training
-```
+![8.png](https://www.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/8.png)
 
 Git clone allows you to specify parameters such as the target folder. If you don't specify it the working copy will be named as the project.