diff --git a/tp_2.md b/tp_2.md index c0dddd411a96f35da9f9470257b7383e248e24db..85c34a45c237a121de9ccca0528b26e817128eb0 100644 --- a/tp_2.md +++ b/tp_2.md @@ -6,7 +6,7 @@ The `git clone <url>` command retrieves the whole history of a project and setup ```sh cd ~/ -git clone gitlab_lbmc:LBMC/file_handle.git git_basis_tp1 +git clone git@gitbio.ens-lyon.fr:LBMC/file_handle.git git_basis_tp1 cd git_basis_tp1 ls -l ``` @@ -123,22 +123,22 @@ git push You don’t have permission to write to this repository (if you want to contribute to the file_handle project you can ask me later). To cope with this problem you are going to create your own remote repository for this project on the gitlab server. -To do so, go to [http://gitlab.biologie.ens-lyon.fr/](http://gitlab.biologie.ens-lyon.fr/) and click on **new project**. +To do so, go to [http://gitbio.ens-lyon.fr/](http://gitbio.ens-lyon.fr/) and click on **new project**. You can give a name to your project (we are going to use `git_basis` in the following commands). Click on **Create project**. You end up on your project home page. The main information is in the **ssh** box containing a link to your repository : -`git@gitlab.biologie.ens-lyon.fr:<user_name>/git_basis.git`. +`git@gitbio.ens-lyon.fr:<user_name>/git_basis.git`. with the https protocol we have: -`https://lmodolo@gitlab.biologie.ens-lyon.fr/<user_name>/git_basis.git` +`https://gitbio.ens-lyon.fr/<user_name>/git_basis.git` -> Note: repositories created on gitlab are _bare_ repository. There is no working -> or stash area on gitlab because nobody works on it. +> Note: repositories created on gitbio are _bare_ repository. There is no working +> or stash area on gitbio because nobody works on it. -At the end of the page [http://gitlab.biologie.ens-lyon.fr/<user_name>/git_basis](http://gitlab.biologie.ens-lyon.fr/<user_name>/git_basis) you have the following instruction to populate your remote repository +At the end of the page [http://gitbio.ens-lyon.fr/<user_name>/git_basis](http://gitbio.ens-lyon.fr/<user_name>/git_basis) you have the following instruction to populate your remote repository from an existing repository. We can check the current remote addresses of our local git repository: @@ -147,16 +147,15 @@ We can check the current remote addresses of our local git repository: git remote -v ``` -**origin** is set to `gitlab_lbmc:LBMC/file_handle.git` for `fetch` and `push` +**origin** is set to `git@gitbio.ens-lyon.fr:LBMC/file_handle.git` for `fetch` and `push` operation. We want to add our repository to the remote addresses of our local git repository. -We are going to use `gitlab_lbmc` instead of `git@gitlab.biologie.ens-lyon.fr` -to match the ssh configuration file and use our ssh key in the connections to +We are going to use `git@gitbio.ens-lyon.fr` url to match the ssh configuration file and use our ssh key in the connections to this server. ```sh -git remote add perso gitlab_lbmc:<user_name>/git_basis.git +git remote add perso git@gitbio.ens-lyon.fr:<user_name>/git_basis.git git remote -v ``` @@ -186,6 +185,6 @@ git merge tp1 git push perso ``` -You can see the graph of our modifications at the following address [http://gitlab.biologie.ens-lyon.fr/<user_name>/git_basis/network/master](http://gitlab.biologie.ens-lyon.fr/<user_name>/git_basis/network/master) +You can see the graph of our modifications at the following address [http://gitbio.ens-lyon.fr/<user_name>/git_basis/network/master](http://gitbio.ens-lyon.fr/<user_name>/git_basis/network/master) [ ****Next: Git together**** ](./tp_3.md#part-3-git-together) diff --git a/tp_3.md b/tp_3.md index 8326ba4402f3e49fe15a9c42ec2b03e4d5f7e571..ddb9171a10eebc661af881047f27cbc1c99f3102 100644 --- a/tp_3.md +++ b/tp_3.md @@ -7,7 +7,7 @@ For the last part of the TP you need to pair with someone else. We will refer to ## Developer **W**: For **C** to be able to push to you repository, you need to grant him access. -The gitlab access control is repository or branch-based. +The gitbio access control is repository or branch-based. Go to the project **Settings**, tab and then to **Member**. You can search **C** and give him a role. Here we will use the role **Master** so **C** has as many rights as **W**. Click on **Add to project** to validate the changes. @@ -19,7 +19,7 @@ The idea behind a branch-based permission is to allow developers to work on a gi Clone **W**’s repository: ```sh -git clone gitlab_lbmc:<W_name>/git_basis.git git_basis_tp2 +git clone git@gitbio.ens-lyon.fr:<W_name>/git_basis.git git_basis_tp2 cd git_basis_tp2 git remote -v git checkout -b tp2