From 04680c80508918004eef0b0202d7440627d03ce4 Mon Sep 17 00:00:00 2001
From: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
Date: Mon, 12 Feb 2018 23:53:07 +0100
Subject: [PATCH] Q3.5.1

---
 REDA_YOUSSEF.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/REDA_YOUSSEF.md b/REDA_YOUSSEF.md
index 586fe9c..4617383 100644
--- a/REDA_YOUSSEF.md
+++ b/REDA_YOUSSEF.md
@@ -787,8 +787,14 @@ $ git commit -m "Q3.4"
 0. Merge avec modifications
   0. Mergez les modifications de la branche `mybranch-2.4` sur `mybranch` (`*echap* :wq *enter*` pour sauvegarder le message de commit et quitter)`*`
   ```
-  git checkout reda_youssef
-  git branch reda_youssef2
+ $ git merge reda_youssef-2.4
+Auto-merging REDA_YOUSSEF.md
+Merge made by the 'recursive' strategy.
+ REDA_YOUSSEF.md | 236 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 219 insertions(+), 17 deletions(-)
+ ```
+    > On commite cette étape Q3.5.1
+ ```
   git add .
   git commit -m "Q3.5.1"
   ```
-- 
GitLab