"Iván V." <elterrible@xxxxxxxxxxxxxxx> writes: > I just did a git stash, and then changed my mind and ran git apply, > thinking that would get me back to where I was... You meant "git stash apply" here, didn't you? > Now I have lots of conflicting merges and files that came back from > the dead (and some files seem lost)... I've been trying to go step by > step to try to get the tree to where it was, but it's very > complicated, so I was wondering if there is anything I can do to get > my working tree exactly to where it was before I ran git stash... To get your working tree and index to exact state as it was before git-stash, you have first to bring current HEAD to the state it was when you did the stash. So if you changed branch, you have to change it back; if you did any commits, you have to rewind (reset) it. If the "base" state isn't the same as it was during "git stash", then "git stash apply" would have to do a merge... which can fail... P.S. Please provide with the exact (best if minimal) sequence of commands, if you want for us to dianoze if there is a bug in git, or user error. -- Jakub Narebski Poland ShadeHawk on #git -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
