From 811b104e1f17294e4c5c2c8f3161e06f534b75cc Mon Sep 17 00:00:00 2001
From: Arnaud Morin <arnaud.morin@ovhcloud.com>
Date: Thu, 13 Jan 2022 16:28:07 +0100
Subject: [PATCH] addorigin

---
 git/training/1-git-conflict.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git/training/1-git-conflict.md b/git/training/1-git-conflict.md
index 5918149..b4ec5ad 100644
--- a/git/training/1-git-conflict.md
+++ b/git/training/1-git-conflict.md
@@ -21,7 +21,7 @@ master
 
 Essayez de merge la branche `branche2`:
 ```
-git merge branche2
+git merge origin/branche2
 ```
 
 Vous allez avoir un conflit.