Q3.7

selimovic-compte-rendu.md

@@ -465,7 +465,58 @@ v
     ```
 
   0. Réalisez le merge de la brache `mybranch-3.6` sur `mybranch`. Le prompt change, pourquoi ? Gerer le conflit et commiter.
+    ```
+    $ git checkout selimovic
+    Switched to branch 'selimovic'
+    $ git merge selimovic-3.6
+    Auto-merging selimovic-compte-rendu.md
+    CONFLICT (content): Merge conflict in selimovic-compte-rendu.md
+    Automatic merge failed; fix conflicts and then commit the result.
+    $ git add -A
+    $ git commit -m "Solve conflict while merging selimovic-3.6 into selimovic"
+    [selimovic 677502e] Solve conflict while merging selimovic-3.6 into selimovic
+    ```
+
 0. Supprimer les branches de feature et afficher toutes les branches restantes, affichez un historique sous forme de graph (`a dog`) de votre repo `*`
+    ```
+    $ git branch -d selimovic-2.4
+    Deleted branch selimovic-2.4 (was ae470aa).
+    $ git branch -d selimovic-3.1
+    Deleted branch selimovic-3.1 (was 0d8fcb8).
+    $ git branch -d selimovic-3.6
+    Deleted branch selimovic-3.6 (was 4e7f0e3).
+    $ git log --all --decorate --oneline --graph
+    *   677502e (HEAD -> selimovic) Solve conflict while merging selimovic-3.6 into selimovic
+    |\  
+    | * 4e7f0e3 Q3.6.3
+    * | 704d8d6 Q3.6.2
+    |/  
+    * bec7f38 Q3.5.2
+    *   1032a2f Merge branch 'selimovic-2.4' into selimovic
+    |\  
+    | * ae470aa Q2.4.3
+    | * 77e2569 Q2.4.2
+    * | 2fadf41 Q3.4
+    * | 1a2af7c Q3.3
+    * | 0d8fcb8 Q3.1.2
+    * | 6ff966f Q2.11
+    * | 4b3e42e Q2.10
+    * | b41b6f3 Q2.7
+    * | 9b99cb6 Q2.6
+    |/  
+    * 434403c Q2.3
+    * 992376b Q2.2
+    | * 3ed4f76 (master) Add new_file
+    |/  
+    * 7a07334 Q1.15
+    * 02672f8 Q1.13
+    * 696e5f9 Q1.10
+    * db1ca34 Q1.9
+    * 80d9397 Rename compte-rendu
+    * e4e58b9 Q1.5
+    * f256d85 Q1.3
+    * 6bd3cbb Add compte-rendu.md
+    ```
 
 ##### 4. Remote
 0. Afficher l'historique de votre repo