The following untracked working tree files would be overwritten by merge, but I don’t care

git add * 
git stash
git pull

if you using Magento then you backup config.php backup which is located to app/etc/config.php.