I’ll introduce the steps to revert when a conflict occurs with git stash pop.

git checkout --ours .
git reset
git checkout .

That’s all from the Gemba where I only use the git stash command occasionally and often forget it.