Pull changes to a remote branch when having done changes to same files:
git stash
git pull
git stash pop