stash: invoke rerere in case of conflict