@kostyn type "git stash", which will get rid of the stray file, and then run the git update and checkout again. That error you saw would definitely mess things up!