Commit 94d1e491 authored by Arnaud Blanchard's avatar Arnaud Blanchard

Document git

parent 9f0225b5
Useful command for **git**
==========================
Merge
=====
`git merge <the branch you merge from>`
Note that git pull merge from he repository branch
Conflicts:
----------
You want to loose all your modifications: `git checkout --theirs <files>`
You want to loose theirs modifications: ` git checkout --ours <files>`
Then `git add <files>`to say you fix the conflict.
Remove a specific commits: `git revert <commit id>`
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