CODEWITHSUNDEEP
gitgit-stash
Catherine
Catherine

Reputation: 14000

Problems with applying stashed changes

I needed to push a quick fix for a bug, so I stashed the changes I was working on. After I finished the bug fix, I committed it, then pulled the changes from the repository, and then pushed my changes.

After this I ran git stash apply, which resulted in this message: CONFLICT (content): Merge conflict in foo.js

I resolved the conflict and staged my changes. However, when I try to run git stash apply again, I get the same conflict message again: CONFLICT (content): Merge conflict in foo.js

I'm not sure what to do--I'm clearly doing something wrong, but I have no idea what. Any help would be much appreciated!

Upvotes: 2

Views: 4380

Answers (1)

Michael Krelin - hacker
Michael Krelin - hacker

Reputation: 143051

You don't need to run git stash apply again. Because the stashed changes are already applied. You may even want to start using git stash pop at some point instead, so that the changes are removed from stash after they're applied.

Upvotes: 7

Related Questions