Solved: fatal: multiple stage entries for merged file ‘Assets/Prefabs/Resources’

In some cases you might run into this git issue

fatal: multiple stage entries for merged file ‘xyz’

OS : Mac
Git : 2.5.4

Solution:
1. Delete git index rm .git/index

2. Add files again git add -A

3. Commit files again git commit -m "Message"