Skip to content
Snippets Groups Projects
Unverified Commit 781dfd05 authored by Laurent Modolo's avatar Laurent Modolo
Browse files

tp.md: fix typo

parent edd15514
Branches
No related tags found
No related merge requests found
......@@ -158,7 +158,7 @@ git st
```
Git doesn’t track folders, only files. For git folders are just structures to organise files.
With the creation of `dict.txt` git is aware of a change in the repository.
With the creation of `letter.txt` git is aware of a change in the repository.
There are *untracked files*.
To start tracking files we use the command `git add` :
......@@ -394,9 +394,9 @@ There are three types of merge :
- Merge of two different lineages
- Merge of two different lineages with conflict
Here the branch `dict` is a direct descendant of `master`.
`dict` contain all the information contained in `master`.
For `master` to gain all the information contained in `dict`, we just have to move the label `master` to the commit pointed by `dict`
Here the branch `dev2` is a direct descendant of `master`.
`dev2` contain all the information contained in `master`.
For `master` to gain all the information contained in `dev2`, we just have to move the label `master` to the commit pointed by `dev2`
```sh
git lo
......@@ -417,7 +417,7 @@ git lo
```
The new commit is a `Merge` commit with the identifiers of its two ancestors.
Here, we didnt have any conflict: in the `dev` branch, we worked on the `data/number.txt` file while in the `master` branch, we worked on the `data/letter.txt` file.
Here, we didn't have any conflict: in the `dev` branch, we worked on the `data/number.txt` file while in the `master` branch, we worked on the `data/letter.txt` file.
Let’s complicate things !
......@@ -613,7 +613,6 @@ this server.
```sh
git remote add perso https://gitlab.biologie.ens-lyon.fr/<user_name>/git_basis.git
git remote add perso https://gitlab.biologie.ens-lyon.fr/<user_name>/git_basis.git
git remote -v
```
......@@ -748,6 +747,7 @@ git status
````sh
## Usage
To use the `file_handle.py` script, enter the following command:
```sh
file_handle.py -f <INPUT_FILE>
```
......@@ -772,7 +772,7 @@ git push
When **W** tries to push his modifications to the remote repository he has an error because **C** made changes to it.
**W** has to get these modifications.
Git advise you to use the command `git pull`. We are not going to use this command and instead to:
Git advises you to use the command `git pull`. We are not going to use this command and instead to:
```sh
git fetch
......@@ -794,7 +794,7 @@ To know how to use the `file_handle.py` script, enter the following command:
```sh
file_handle.py --help
```
\====
=======
To use the `file_handle.py` script, enter the following command: ```sh
file_handle.py -f <INPUT_FILE>
```
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment