Git part 2:
git pull
=
git fetch && git merge FETCH_HEAD
Conflicts:
git cherry-pick --continue git cherry-pick --quit git cherry-pick --abort
git reset --hard <some commit>
By Przemysław Fałowski