Git-pull Index Page 1
How to overwrite local files while doing "git pull"?
In this tutorial we are going to explain how to force a git pull when there are untracked files that will be overwritten. This tutorial solved the error: Untracked working tree file 'public/images/icon.gif' would be overwritten by merge.