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

23.4.ii

parent 8cf25e63
No related branches found
No related tags found
No related merge requests found
......@@ -369,6 +369,9 @@ https://gitlab.isima.fr/mazenovi/2017-F2-Forge
Merge made by the 'recursive' strategy.
cdpw_tp1_SERRE_PRUNIER.md | 54 ++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 51 insertions(+), 3 deletions(-)
clserre1@A210PC12:/h/Documents/cdpw $ git commit -am"23.4.i"
[SERRE_PRUNIER 8cf25e6] 23.4.i
1 file changed, 34 insertions(+)
```
0. Affichez un historique sous forme de graph (`a dog`) de votre repo `*`
```git
......@@ -397,6 +400,9 @@ https://gitlab.isima.fr/mazenovi/2017-F2-Forge
* b28292b Q1.8
* dd449ba Q1.6
* 7b7f60f Q1.2
clserre1@A210PC12:/h/Documents/cdpw $ git commit -am"23.4.ii"
[SERRE_PRUNIER 8ec6436] 23.4.ii
1 file changed, 3 insertions(+)
```
0. Merge avec conflit
1. Céer une nouvelle branche `mybranch-3.6`
......
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