I keep getting this error when I do a git pull every 60 seconds on my monitoring server. I am using chef and a python script to \"git pull\" every 60 seconds.
Please move or remove them before you can merge. Aborting
Please move or remove them before you can merge.
Aborting
The solution is actually very simple:
git clean -d -fx ""