xxxxxxxxxx
git checkout <filepath> --ours # for accepting current
git checkout <filepath> --theirs # for accepting incomming changes
xxxxxxxxxx
git checkout <filepath> --ours # for accepting current changes
git checkout <filepath> --theirs # for accepting incomming changes
git checkout . --ours # for accepting all current changes
git checkout . --theirs # for accepting all incomming changes