0

i did a git stash and had some changes that were not added to the index, when i did a git stash apply, they were not reapplied. Is there a way to get back from this?

Thanks and kind regards

user871784
  • 1,247
  • 4
  • 13
  • 32
  • When you stash something (without --keep-index), all changes to existing files are saved, whether or not they have been staged. What exactly happened? – trent Jul 22 '15 at 15:24
  • thanks for your comment. i needed to fix some bugs, so i did a git stash, then i pulled, pushed my commit, did git stash apply and then my changes were gone and not reapplied..? Any ideas..? – user871784 Jul 22 '15 at 15:52
  • Show the output from `git stash apply`. – Roman Jul 22 '15 at 17:44
  • 1
    Sounds like a merge conflict. You'll have to resolve the conflict and then drop the stash if that's the case. As Roman said, the output would tell you this. – mkasberg Jul 22 '15 at 17:47
  • error: Your local changes to the following files would be overwritten by merge: app/.meteor/versions Please, commit your changes or stash them before you can merge. Aborting – user871784 Jul 23 '15 at 16:48
  • Ahhh ok i kind of didnt see that - thanks for the help! – user871784 Jul 23 '15 at 16:49

0 Answers0