Pierre-Yves Barriat 7 years ago
parent
commit
a2b19c17b0

+ 1 - 1
project/windows/README.md

@@ -6,7 +6,7 @@ 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/windows/working_environment)
-2.     [Prepare issues on Gogs](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/gogs_issues)
+2.     [Prepare issues](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/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)

+ 2 - 2
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/windows/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/issues)).
 
 If you don't specify the `-m` parameter a text editor will open automatically to allow you to write the commit message.
 
@@ -57,4 +57,4 @@ git commit
 git push origin <branch_name>
 ```
 
-where `<branch_name>` is the name used in the previous step.
+where `<branch_name>` is the name used in the previous step.

+ 0 - 13
project/windows/gogs_issues/README.md

@@ -1,13 +0,0 @@
-# Prepare issues on Gogs
-
-In this chapter we will create the issues on Gogs to tell other developers in the collaborative project what are we going to develop: a bash function to say Hello in a language of your choice from the table above.
-
-Gogs is a visual layer that works on Git. It displays graphically in your web browser all the information that Git provides: the ongoing developments, the track of the modifications, browse to any point in the past, ... and on top of that, allows to discuss issues in a forum format. We will centralise all TECLIM developments in this portal. 
-
-#### Exercise 4 – Open new issue in Git_Training project
-
-*     Open the browser and go to the Gogs project Git_Training main page.
-*     Issues .. + New issue .. Submit new issue.
-*     Put the short name of your function (e.g. greetings_catalan) in the title, write a full description and put the label “enhancement”.
-*     Click on “Create issue”.
-*     You can then see a list with all the issues. Each is assigned an #issue_number.

+ 15 - 0
project/windows/issues/README.md

@@ -0,0 +1,15 @@
+# Prepare issues
+
+In this chapter we will create the issues on Github to tell other developers in the collaborative project what are we going to develop.
+
+Let's walk through a basic example together. We'll craft a small website. Then, we'll create multiple branches to experiment with different CSS styles. We'll compare the styles, choose which we like best, and integrate the favored styles into our "final draft" (that is, our master branch). You and your partners should begin following along at this time.
+
+Github is a visual layer that works on Git. It displays graphically in your web browser all the information that Git provides: the ongoing developments, the track of the modifications, browse to any point in the past, ... and on top of that, allows to discuss issues in a forum format. We will centralise all developments in this portal. 
+
+#### Exercise 4 – Open new issue in Git_Training project
+
+*     Open the browser and go to the Github project Git_Training main page.
+*     Issues .. + New issue .. Submit new issue.
+*     Put the short name of your function (e.g. greetings_catalan) in the title, write a full description and put the label “enhancement”.
+*     Click on “Create issue”.
+*     You can then see a list with all the issues. Each is assigned an #issue_number.

+ 34 - 4
project/windows/working_environment/README.md

@@ -1,18 +1,16 @@
 # Set up your working environment
 
-## Exercise 1 – Git global configuration
+## Exercise 1 – Git global configuration and Github configuration
 
 First of all you will have to configure git locally in your desktop:
 
 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 – Github configuration
-
 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 administrators of this (these) project(s) asking access to.
 
-## Exercise 3 – Clone into a working environment
+## Exercise 2 – Clone into a working environment
 
 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):
 
@@ -77,3 +75,35 @@ Date:   Thu Dec 3 19:04:16 2015 +0100
     Add readme
 ```
 
+## Exercise 3 – Basics operation
+
+### 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
+
+Click with the right mouse button and click on “Git Commit”
+
+![10.png](https://www.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/10.png)
+
+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:
+
+![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].
+
+### 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.
+
+### 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. 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.

+ 0 - 7
project/windows/working_environment/env.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-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

BIN
resources/10.png


BIN
resources/11.png


BIN
resources/12.png


BIN
resources/13.png


BIN
resources/8.png


BIN
resources/9.png