3

I have an issue with my git repository. When adding changes to my client app, git seems to get confused about which files were changed. See image below:

enter image description here

When trying to commit the changes I get this error message:

enter image description here

Does anybody know how to resolve this?

Bail P
  • 251
  • 1
  • 5
  • 17

2 Answers2

3

I had this same problem recently, and it was caused by having a separate .git in the Client sub-directory. I deleted it and it was fixed.

opera22
  • 31
  • 3
  • 1
    HOWEVER, you will also need to execute `git rm --cached ` so that the parent repo will know to start tracking the files/folders that were previously tracked by the sub-directory's git "submodule". Reference: https://stackoverflow.com/a/25093098/9974771 – Abel Wenning Jan 24 '22 at 06:48
0

I actually faced that problem not so long ago. If this happens, try to locate your main client folder and delete it. Try adding it again then, and it should work. At least this worked for me.

Samiii
  • 1