{{tag>Brouillon git}} # Git facile Voir [[http://lilobase.wordpress.com/2014/05/12/a-la-decouverte-de-git/]] // PC Dépôt // ~~~bash mkdir test.git cd test.git mkdir test.git ~~~ // PC1 // ~~~bash echo "test1" > test1.txt echo "test1" > test.txt ~~~ // PC2 // ~~~bash echo "test2" > test2.txt echo "test2" > test.txt ~~~ // PC3 // ~~~bash echo "test3" > test3.txt echo "test3" > test.txt ~~~ // PC1, PC2, PC3// ~~~bash git init git add . git commit -m "1ere initialisation" ~~~ // PC1 // ~~~bash git push -u git@koala:test.git master ~~~ // PC2, PC3// ~~~bash git pull git@koala:test.git # Pour chaque conflit : modifier fichier en question git add fichier_conflict git commit git push -u git@koala:test.git master ~~~ // PC1, PC2, PC3 // ~~~bash git add . git commit git pull git@koala:test.git git add . git commit git push -u git@koala:test.git master ~~~ ~~~ ########### Merge koala:test Conflicts: test.txt # ~~~