Useful commands for git
`git merge <the branch you merge from>`
Note that git pull merge from he repository branch
You can use **meld** to have a graphical interface to select the differences.
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.
Remove a specific commits: `git revert <commit id>`