Steps to revert when git stash pop results in conflict

Tadashi Shigeoka ·  Mon, May 25, 2015

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

Git
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.