(one) Solution for Netbeans 7.1: Try pulling. It is also likely to fail. Now look at the logs (they usually appear in the IDE). There one / more lines say:
"Failed to remove due to this file:"
Find this file, delete it (backup to). This is usually a .gitignore file, so you will not delete the code. Press again. Now everything should work fine.
Sliq Aug 07 2018-12-12T00: 00Z
source share