From 4a165c0bf7672e4beeb2af64d324bccfa7ec05f7 Mon Sep 17 00:00:00 2001
From: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
Date: Mon, 12 Feb 2018 23:35:36 +0100
Subject: [PATCH] Q3.1.2

---
 REDA_YOUSSEF.md | 21 +++++++++++++++------
 easy_merge      |  1 +
 2 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 easy_merge

diff --git a/REDA_YOUSSEF.md b/REDA_YOUSSEF.md
index 87b3e46..f01e4c4 100644
--- a/REDA_YOUSSEF.md
+++ b/REDA_YOUSSEF.md
@@ -497,16 +497,25 @@ $ git commit -m "Q2.11"
 0. Merge depuis head
   0. switcher sur une nouvelle branche `mybranch-3.1`
   ```
-  git brach -b reda_youssef_3
+  $ git checkout -b reda_youssef-3.1
+Switched to a new branch 'reda_youssef-3.1'
   ```
+
   0. ajout un nouveau fichier nommé easy_merge avec la date et l'heure actuelle `*`
   ```
-  touch easy_merge
-  date > easy_merge
-  git add .
-  git commit -m "Q3.1.2"
+  $ touch easy_merge
+  $ date > easy_merge
+  ```
+    > On commite cette étape Q3.1.2
   ```
-  0. merger la branche `mybranch-4.1` sur `mybranch`
+  $ git add .
+  $ git commit -m "Q3.1.2"
+[reda_youssef-3.1 3288cda] Q3.1.2
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+ create mode 100644 easy_merge
+  ```
+
+  0. merger la branche `mybranch-3.1` sur `mybranch`
   ```
   git checkout reda_youssef
   git merge reda_youssef_3
diff --git a/easy_merge b/easy_merge
new file mode 100644
index 0000000..8a42eb3
--- /dev/null
+++ b/easy_merge
@@ -0,0 +1 @@
+lun. 12 févr. 2018 23:34:01
-- 
GitLab