How do I ignore an error on ‘git pull’ about my local changes would be overwritten by merge?
If you want remove all local changes – including files that are untracked by git – from your working copy, simply stash them: If you don’t need them anymore, you now can drop that stash: If you don’t want to stash changes that you already staged – e.g. with git add – then add the option –keep-index. Note … Read more