Pierre-Yves Barriat 7 年之前
父節點
當前提交
9f8b2837cc
共有 5 個文件被更改,包括 54 次插入9 次删除
  1. 17 0
      project/README.md
  2. 7 7
      project/linux/README.md
  3. 1 1
      project/linux/functions/README.md
  4. 1 1
      project/linux/pull_master/README.md
  5. 28 0
      project/windows/README.md

+ 17 - 0
project/README.md

@@ -0,0 +1,17 @@
+# Git tutorial - session
+We are going to do some exercises in this dummy project.
+
+- [linux](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux)
+- [windows](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows)
+
+## Basics
+
+We're going to learn what Git and GitHub are, how to set up a project, track changes, push code to GitHub, clone projects back down from GitHub into a local Git repository through your Git client (e.g. using TortoiseGit or GitBash), and even publish websites on GitHub Pages.
+
+## Branching
+
+The act of making multiple copies of the same code in the same project. Usually in order to do different things with the same code base, or to allow multiple people to work on the same code at the same time.
+
+- Branch: Another copy of your code
+- Master Branch: Like the "final draft" of your code.
+- Feature Branches: A common term for branches that are not master. Usually branches meant for experimenting with new features before adding them to the final version of the project.

+ 7 - 7
project/linux/README.md

@@ -19,10 +19,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/working_environment)
-2.     [Prepare issues on Gogs](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/gogs_issues)
-3.     [Prepare branches](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/branches)
-4.     [Add new functions](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/functions)
-5.     [Create pull request](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/pull_request)
-6.     [Review and test others' branches](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/review)
-7.     [Pull master changes](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/pull_master)
+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 - 1
project/linux/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/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/linux/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/linux/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/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/linux/review), checkout the master branch.
 
 ```
 git checkout master

+ 28 - 0
project/windows/README.md

@@ -0,0 +1,28 @@
+# Git tutorial - session
+We are going to do some exercises in this dummy project.
+
+It is very simple, only consists in a couple of files written in bash and you will have to write some functions there. In the end the idea is to enhance the functionality of the script with functions to say 'Hello' in different languages:
+
+| Languages                 |                                           |
+| ------------------------- | ----------------------------------------- |
+| **Dutch**: Hallo wereld! 	    | **English**: Hello world!                     |     
+| **French**: Salut monde! 	    | **German**: Hallo Welt!                       |   
+| **Italian**: Ciao mondo! 	    | **Portuguese**: Olá mundo!                    |      
+| **Spanish**: ¡Hola mundo! 	| **Catalan**: Hola món!                        |  
+| **Turkish**: Merhaba dünya!   | **Czech**: Ahoj světe!                        |  
+| **Danish**: Hej, verden! 	    | **Faroese**: Hey, heimurin!                   |       
+| **Norwegian**: Hei, verden!   | **Hawaiian**: Aroha e ao                      |    
+| **Swedish**: Hej, världen! 	| **Welsh**: Helo byd!                          |
+| **Irish**: Dia dhuit domhan! 	| **Cornish**: Dydh da bys!                     |     
+| **Afrikaans**: Hallo, wêreld! | **Latin**: Salve, munde!                      |    
+| **Lakota**: Hau oyáte 	    | **Japanese**: こんいちは世界 (konnichiwa sekai)  |
+
+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)