|
|
@@ -17,12 +17,12 @@ It is very simple, only consists in a couple of files written in bash and you wi
|
|
|
| **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 Gitlab, and to follow a standard procedure to develop collaboratively. Afterwards, you should apply the same methods to any other collaborative development inside the ES department. The objectives will be achieved gradually following these topics:
|
|
|
+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](http://www.climate.be:3000/TECLIM/Git_Training/src/master/project/working_environment)
|
|
|
2. [Prepare issues on Gitlab](http://www.climate.be:3000/TECLIM/Git_Training/src/master/project/gogs_issues)
|
|
|
3. [Prepare branches](http://www.climate.be:3000/TECLIM/Git_Training/src/master/project/branches)
|
|
|
4. [Add new functions](http://www.climate.be:3000/TECLIM/Git_Training/src/master/project/functions)
|
|
|
-5. [Create merge request](http://www.climate.be:3000/TECLIM/Git_Training/src/master/project/pull_request)
|
|
|
+5. [Create pull request](http://www.climate.be:3000/TECLIM/Git_Training/src/master/project/pull_request)
|
|
|
6. [Review and test others' branches](http://www.climate.be:3000/TECLIM/Git_Training/src/master/project/)
|
|
|
7. [Pull master changes](http://www.climate.be:3000/TECLIM/Git_Training/src/master/project/)
|
