I think resolve should do that (I don't know whether it currently does). But this seems safer than playing with git stash.