Here is one from many way to use [Git][git]. This method is sufficient to work on a project. Not there is many other *workflows*.
## Basic usage
Work with [Git][git] immediately:
<fr>
+ récupérer les modifications des autres <spanclass="black">`git pull`</span>
+ voir les détails de ces modifications <spanclass="black">`git log`</span>
+ Plusieurs fois:
+ *Faire une modification atomique*
+ verifier le details de ses modifications <spanclass="black">`git status`</span> et <spanclass="black">`git diff`</span>
+ indiquer si nécessaire que de nouveaux fichiers doivent être *versionnés*<spanclass="black">`git add [file]`</span>
+ enregistrer ses modifications <br/><spanclass="black">`git commit -a -m "message"`</span>
+ envoyer ses modifications aux autres <spanclass="black">`git push`</span> (refaire un `git pull` si le push renvoie une erreur).
</fr>
<en>
+ Get modification done by others <spanclass="black">`git pull`</span>,
+ See details of these modifications <spanclass="black">`git log`</span>,
+ Many times:
+ *Make an atomic modification*
+ Verify details of this modification: <spanclass="black">`git status`</span> and <spanclass="black">`git diff`</span>,
+ Add some file to be versionned if necessary:<br/><spanclass="black">`git add [file]`</span>,
+ Save you modifications <br/><spanclass="black">`git commit -a -m "message"`</span>,
+ Send your modifications to others: <spanclass="black">`git push`</span> (redo a `git pull` if push return an error).
</en>
With these few commands you can use [Git][git]. Even if it is sufficient, you need to know one more thing before really begin ; How to manage *conflicts*.
### Conflicts management
Conflicts can arise when you change the same line of code on the same file from another branch you're merging. It can seems a bit intimidating, but with [Git][git] this kind of thing is really simple to handle.