arnaud
/
trainings
1
0
Fork 0
Code

addorigin

This commit is contained in:
Arnaud Morin 2022-01-13 16:28:07 +01:00
parent 7943af3d11
commit 811b104e1f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git/training/1-git-conflict.md
View File

@ -21,7 +21,7 @@ master
Essayez de merge la branche `branche2`:
```
git merge branche2
git merge origin/branche2
```
Vous allez avoir un conflit.