Git fatal: multistage entries for a merged file

Question

Git throws an error message:

fatal: multiple stage entries for merged file 

I was on the side ( Getting a fatal error in git for multi-stage entries ) and read the workaround:

 cd /patH/to/second/cloned/repo git --work-tree=/path/to/first/repo add . 

Now changes can be requested through status, but after that I need to do it now? When I use git add, then everything returns to the latest version. All changes have disappeared. The changes have been deleted and my new repo again has the old status. How can I push all changes to a new repository? I am using git version 2.2.0 for OS X 10.10.

Answer 1

I solved this problem:

In the terminal, enter the following:

 rm .git/index (press enter key) git add -A (press enter key) git commit -m "your commit instruction"