Can anyone tell me what this Mercurial error means?
untracked file in working directory differs from file in requested revision
Just accept the error dialog then tick Discard local changes, no backup
Discard local changes, no backup
And you should be good, it will overwrite any untracked local files...