No matches were found for subject:"\"git stash pop\" is doing an unwanted \"git add\" when there are conflicts."