From 435420273565f039b4feefbf06cefe02e59afcbc Mon Sep 17 00:00:00 2001
From: thoth <thoth@mailoo.org>
Date: Sat, 23 Nov 2019 00:16:39 +0100
Subject: [PATCH] feat: add lines

---
 git.md    | 4 ++++
 gitlab.md | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/git.md b/git.md
index 803378c..386ef3a 100644
--- a/git.md
+++ b/git.md
@@ -335,6 +335,10 @@ pour cela, on retoune sur la branche cible, et on utilise merge
 git clone https://gitlab.clubelek.fr/formations/software-engineering/example-conflict.git
 cd example-conflict
 
+# découvrir la branche feature/rabbit
+git checkout feature/rabbit
+git checkout master
+
 # Conflit lors de la fusion
 git merge feature/rabbit
 ```
diff --git a/gitlab.md b/gitlab.md
index 23603ff..e05a9b8 100644
--- a/gitlab.md
+++ b/gitlab.md
@@ -167,6 +167,12 @@ Priorité : 
 
 ---
 
+**Exemple**
+
+[https://gitlab.clubelek.fr/formations/software-engineering/example-remote/issues](https://gitlab.clubelek.fr/formations/software-engineering/example-remote/issues)
+
+---
+
 ## Milestones
 
 Permet de définir des échances
-- 
GitLab