... | ... | @@ -4,8 +4,7 @@ |
|
|
|
|
|
### 1) Create your own remote repository in gitlab
|
|
|
|
|
|
You need one remote repository per team. So if you work as a team, **only one
|
|
|
student has to do this step**.
|
|
|
You need one remote repository per team. So if you work as a team, **only one student has to do this step**.
|
|
|
|
|
|
* Point your web browser to [the forge](https://forge.tic.eia-fr.ch/git/])
|
|
|
* Choose the tab "Projects"
|
... | ... | @@ -15,8 +14,7 @@ student has to do this step**. |
|
|
* Copy the URI of your project
|
|
|
(it should be `https://forge.tic.eia-fr.ch/git/user.name/tp-algo1-2014.git`).
|
|
|
|
|
|
### 2) Add the teacher, the assistant, and your co-worker to your
|
|
|
repository
|
|
|
### 2) Add the teacher, the assistant, and your co-worker to your repository
|
|
|
|
|
|
* Select your project and navigate to `Settings -> Project Members`
|
|
|
* Add the teacher and assistant as a "Reporter"
|
... | ... | @@ -43,8 +41,7 @@ the pass-phrase that you used to protect your private key. |
|
|
|
|
|
### 4) Add the upstream repository
|
|
|
|
|
|
Here you will add the teacher's repository. At least one team member has to do
|
|
|
this step, but this is also OK if all team members do this step.
|
|
|
Here you will add the teacher's repository. At least one team member has to do this step, but this is also OK if all team members do this step.
|
|
|
|
|
|
* Open the details of your repository by double-clicking on it.
|
|
|
* Right-click on "Remotes".
|
... | ... | @@ -60,9 +57,7 @@ this step, but this is also OK if all team members do this step. |
|
|
* Click "Finish".
|
|
|
* Click "Save".
|
|
|
|
|
|
Now "origin" is **your** repository where you save your work and "upstream"
|
|
|
is the **teacher's repository** where you will find the initial files for
|
|
|
the assignments.
|
|
|
Now "origin" is **your** repository where you save your work and "upstream" is the **teacher's repository** where you will find the initial files for the assignments.
|
|
|
|
|
|
### 5) Create your first Java project for this lecture
|
|
|
|
... | ... | @@ -93,8 +88,7 @@ repository (.../git/tp-algo1-2014/s01). |
|
|
|
|
|
### 1a) At the beginning of each new assignment, fetch the "upstream"
|
|
|
|
|
|
This step must be done by **one team member** only (one with the remote
|
|
|
"upstream" configured).
|
|
|
This step must be done by **one team member** only (one with the remote "upstream" configured).
|
|
|
|
|
|
* Open the "Git perspective":
|
|
|
`Window -> Open Perspective -> Other... -> Git Repository Exploring`.
|
... | ... | @@ -128,8 +122,7 @@ This step must be done by all team members. |
|
|
|
|
|
## Using git with SSH instead of HTTPS
|
|
|
|
|
|
You will learn here how to generate a cryptography key pair and use it with git.
|
|
|
You don't need this to work the the gitlab of the school.
|
|
|
You will learn here how to generate a cryptography key pair and use it with git. You don't need this to work the the gitlab of the school.
|
|
|
|
|
|
### 1) Generate a SSH key pair
|
|
|
|
... | ... | |