GIT.md 514 Bytes
Newer Older
Arnaud Blanchard's avatar
Arnaud Blanchard committed
1

Arnaud Blanchard's avatar
Arnaud Blanchard committed
2 3
Useful commands for git
=======================
Arnaud Blanchard's avatar
Arnaud Blanchard committed
4 5 6 7 8 9 10 11 12 13

Merge
=====

`git merge <the branch you merge from>`

Note that git pull merge from he repository branch

Conflicts:
----------
Arnaud Blanchard's avatar
Arnaud Blanchard committed
14
You can use **meld** to have a graphical interface to select the differences. 
Arnaud Blanchard's avatar
Arnaud Blanchard committed
15

Arnaud Blanchard's avatar
Arnaud Blanchard committed
16 17 18
You want to get only their modifications: `git checkout  --theirs <files>` 

You want to get only yours modifications: ` git checkout  --ours <files>`
Arnaud Blanchard's avatar
Arnaud Blanchard committed
19 20 21 22

Then `git add <files>`to say you fix the conflict.

Remove a specific commits: `git revert <commit id>`