title: Android studio git message: following untracked working tree files would be overwritten by merge, but not showing which files
body: <p>I'm working on an android project in android studio and using VCS for working on git with the other members of the team.
  Last time I tried to pull from origin, the following error came up:
  "following untracked working tree files would be overwritten by merge", but it doesn't show me any file that caused the error.
  I checked and every class and file in the project is added to git, so I don't know what the problem could be.
  The change I've done was creating the folder "drawable" under the folder "res" and added an image that I use in the app; both was added to git. 
  What should I do? </p>