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.