Git stash pop - merge required, index update failed

Question

I can’t open my wallet because I merged a branch that apparently conflicts with my wallet, and now my cache, apparently, cannot be popped up.

app.coffee: needs merge unable to refresh index 

Does anyone know how to solve this?

CORRECTED!

It turns out that the actual problem was the unresolved merge conflict from the merger, NOT , which caused the merge conflict to occur.

Resolution: Commit the conflicting file.

Answer 1

Check git status .
As the FP is mentioned,

The actual problem was the unresolved merge conflict due to the merger, NOT that the cache could cause the merge conflict.

This is where git status can mention this file as " both modified "

Solution: commit the conflicting file.

---

You can find a similar situation 4 days ago while writing this answer (March 13, 2012) with the following post: “ Unable to extract because you have unsecured files ”:

 julita@yulys:~/GNOME/baobab/help/C$ git stash pop help/C/scan-remote.page: needs merge unable to refresh index 

What you did was fix the merge conflict (edit the desired file and commit it):
See " How do I fix merge conflicts in Git? "

Blog post author:

 julita@yulys:~/GNOME/baobab/help/C$ git reset --hard origin/mallard-documentation HEAD is now at ff2e1e2 Add more steps for optional information for scanning. 

Those. abort the current merge completely, allowing you to apply git stash pop .
See " Canceling a Merge in Git ".

These are your two options.

Answer 2

I had this problem, and then the conflict was resolved and completed, and re-executing git stash pop again restored the same cache (causing the same conflict :-().

I needed a git stash drop to get rid of it.

Answer 3

This is much simpler than the accepted answer. You need:

1. Check git status and paths without it. Fix conflicts. You can skip this step if you want to do it later.

2. Add all of these files in a path without an index for indexing using git add <filename> .

3. Now do git stash pop . If you encounter any conflicts, they will need to be resolved again.

Answer 4

If someone has this problem outside of the merge / conflict / action, then this could be the git lock file for your project causing the problem.

 git reset fatal: Unable to create '/PATH_TO_PROJECT/.git/index.lock': File exists. rm -f /PATH_TO_PROJECT/.git/index.lock git reset git stash pop 

Answer 5

I found that the best solution is to put your cache away and make a decision after that.

git stash branch <branch-name>

if you cancel clearing your cache, you may lose your changes and you will have to go back to the journal.

Answer 6

You need to add app.coffee to the production.

Make git add app.coffee and then you can apply your cache (after that git add app.coffee commit and click).

Answer 7

This is how I solved the problem:

git status (see the set of files from the previous stash, pull, pop stash and continue.) git stash (see the question of merging needs) git add. (add files so that my work resolves my merges locally) git stash (no errors) git pull (no errors) git stash pop (no errors and keep working)