从Git Detached HEAD恢复

Question

我错误地在GitEye中愚弄我双击标签。我的存储库检出了那个特定的标签和

git status给出以下输出 HEAD detached at added-MySQL-cnf。我只想回到我的master分支。我按照这个link创建了一个新的tmp分支。现在，当我执行git checkout master时应该结帐到master分支。

git checkout master
error: The following untracked working tree files would be overwritten by checkout:
    docs/make.bat
    scripts/mysql_backup.bat
    scripts/run.bat
Please move or remove them before you can switch branches.
Aborting

git status         
On branch tmp
Untracked files:
    (use "git add <file>..." to include in what will be committed)

    ../docs/
    ../scripts/

nothing added to commit but untracked files present (use "git add" to track)

和

git stash
No local changes to save

我不知道该怎么做。可以请某人帮助我，我只想回到我的master branch。