diff --git a/REDA_YOUSSEF.md b/REDA_YOUSSEF.md index 4617383c2f42d4398084e56de522843f66c7cf55..214a0d1067e3995363589ca89257ef386f1cf881 100644 --- a/REDA_YOUSSEF.md +++ b/REDA_YOUSSEF.md @@ -795,15 +795,46 @@ Merge made by the 'recursive' strategy. ``` > On commite cette étape Q3.5.1 ``` - git add . - git commit -m "Q3.5.1" + $ git add . + $ git commit -m "Q3.5.1" +[reda_youssef 04680c8] Q3.5.1 + 1 file changed, 8 insertions(+), 2 deletions(-) ``` + 0. Affichez un historique sous forme de graph (`a dog`) de votre repo `*` ``` - git log --all --graph --decorate --oneline - git add . + $ git log --all --graph --decorate --oneline +* 04680c8 (HEAD -> reda_youssef) Q3.5.1 +* 563d694 Merge branch 'reda_youssef-2.4' into reda_youssef +|\ +| * 02a31d5 (reda_youssef-2.4) Q2.4.5 +| * d72c9c1 Q2.4.4 +| * 3dd3708 Q2.4.3 +| * 12bae9c Q2.4.2 +* | cbc5756 Q3.4 +* | b73a302 Q3.3 +* | 4a165c0 (reda_youssef-3.1) Q3.1.2 +* | f258f21 Q2.11 +* | ca0e5da Q2.10 +* | f50a0e6 Q2.6 +|/ +* 71592a8 Q2.3 +* 03c3017 Q2.2 +| * b2acb20 (master) Q2.9 +|/ +* 717b390 Q1.15 +* 715a4ee Q1.13 +* 51a5add Q1.10 +* a38f03f Q1.9 +* abfd2d9 Q1.7 +* 3ec344e Q1.3 + ``` + > On commite cette étape Q3.5.2 + ``` + $ git add . git commit -m "Q3.5.2" ``` + 0. Merge avec conflit 0. Céer une nouvelle branche `mybranch-3.6` ```