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 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.
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.