Skip to content
Snippets Groups Projects
Commit e2b7cbf4 authored by Clement  SERRE's avatar Clement SERRE
Browse files

Q3.1.II

parent 87d1e67b
No related branches found
No related tags found
No related merge requests found
......@@ -258,6 +258,11 @@ https://gitlab.isima.fr/mazenovi/2017-F2-Forge
```
0. ajout un nouveau fichier nommé easy_merge avec la date et l'heure actuelle `*`
```git
clserre1@A210PC12:/h/Documents/cdpw $ echo "19:09 08/01/2018" > easy_merge
clserre1@A210PC12:/h/Documents/cdpw $ git commit -am"Q3.1.II"
[SERRE_PRUNIER 1c053bd] Q3.1.II
1 file changed, 1 insertion(+)
create mode 100644 easy_merge
```
0. merger la branche `mybranch-4.1` sur `mybranch`
0. Afficher le status
......
19:09 08/01/2018
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment