看到旧的存储后如何返回到最新提交

Question

I applied a stash and then made several commits. After that, I decided to do a quick look at the stash again. So I typed:

git stash apply stash@{0}

I just wanted to see and did nothing. Now I just want to go back to my latest commit. When I do

git checkout master

It gives error message

error: you need to resolve your current index first
test.js: needs merge

So in this condition, how to go back to my latest commit? I also want to know how to check old stash the right way.

Answer 1

Use the following to reverse apply the stash : Retrieve the stash patch and apply in reverse

git stash show -p stash@{0} | git apply -R

Or try

git reset --merge and see if you can revert from the new state.