After running
git stash pop
I get the message
Auto-merging salcode/src/example.php
CONFLICT (content): Merge conflict in salcode/src/example.php
I want to go back to ignoring any new changes in this file and go back to the version stored in Git. If I try to correct this with
git checkout salcode/src/example.php
It fails with the error
error: path ‘salcode/src/example.php’ is unmerged
This can be fixed by the following two lines:
git reset salcode/src/example.php
git checkout salcode/src/example.php
Leave a Reply