Commit 499b208c authored by Arnaud Blanchard's avatar Arnaud Blanchard

update doc

parent 0cb02474
Useful command for **git**
==========================
Useful command for git
======================
......@@ -12,9 +12,11 @@ Note that git pull merge from he repository branch
Conflicts:
----------
You want to loose all your modifications: `git checkout --theirs <files>`
You can use **meld** to have a graphical interface to select the differences.
You want to loose theirs modifications: ` git checkout --ours <files>`
You want to get only their modifications: `git checkout --theirs <files>`
You want to get only yours modifications: ` git checkout --ours <files>`
Then `git add <files>`to say you fix the conflict.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment