Twas brillig at 00:42:38 30.04.2008 UTC+04 when Alexey Morsov did gyre and gimble:

 AM> Господа, git что, обзавелся AI и стал издеваться?
 AM> samurai@home ~/git/sonata $ git checkout master
 AM> fatal: Untracked working tree file 'sonata/sonata/audioscrobbler.py' would
 AM> be removed by merge.
 AM> samurai@home ~/git/sonata $ git status
 AM> # On branch upstream
 AM> nothing to commit (working directory clean)

Может он в .gitignore затесался?

-- 
JID: dottedmag@altlinux.org / dottedmag@jabber.dottedmag.net