-----
# Custom
isHidden: false
menupriority: 3
kind: article
created_at: 2009-11-12T11:39:54+02:00
title: The Adventure Begins
multiTitle:
fr: Utiliser Git simplement et rapidement
en: Use Git with very few commands
-----
# Here we go!
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:
+ récupérer les modifications des autres `git pull`
+ voir les détails de ces modifications `git log`
+ Plusieurs fois:
+ *Faire une modification atomique*
+ verifier le details de ses modifications `git status` et `git diff`
+ indiquer si nécessaire que de nouveaux fichiers doivent être *versionnés* `git add [file]`
+ enregistrer ses modifications
`git commit -a -m "message"`
+ envoyer ses modifications aux autres `git push` (refaire un `git pull` si le push renvoie une erreur).
+ Get modification done by others `git pull`,
+ See details of these modifications `git log`,
+ Many times:
+ *Make an atomic modification*
+ Verify details of this modification: `git status` and `git diff`,
+ Add some file to be versionned if necessary:
`git add [file]`,
+ Save you modifications
`git commit -a -m "message"`,
+ Send your modifications to others: `git push` (redo a `git pull` if push return an error).
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.
#### example
You start from the following file
Zoot
and you modify one line
except during this time, another user had also modified the same line and had done a `push`.
Now when you do a:
$ git pull
remote: Counting objects: 5, done.
remote: Total 3 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From /home/e640846/tmp/conflictTest
d3ea395..2dc7ffb master -> origin/master
Auto-merging foo
CONFLICT (content): Merge conflict in foo
Automatic merge failed; fix conflicts and then commit the result.
Our file `foo` now contains:
<<<<<<< HEAD:foo
Zoot the pure
=======
Zoot, just Zoot
>>>>>>> 2dc7ffb0f186a407a1814d1a62684342cd54e7d6:foo
#### Conflict resolution
To resolve the conflict you only have to edit the file for example, writing:
and to commit
git commit -a -m "conflict resolved"
Now you're ready to use [Git][git].
[Git][git] provide many other functionnalities. Now we'll see some [Git][git] usages older CVS couldn't handle.
[git]: http://git-scm.org "Git"