Git ：git checkout 报错 error: Your local changes to the following files would be overwritten by checkout

很多初学者，经常会遇到类似如下的错误：

[root@istester istester_idoxu6]# git checkout master 
error: Your local changes to the following files would be overwritten by checkout:
        idoxu.ini
Please commit your changes or stash them before you switch branches.
Aborting

解决 ，

1、提交更新，再切换分支 ；

执行如下，

[root@istester istester_idoxu6]# git add *
[root@istester istester_idoxu6]# git commit -m "isTester"
[istester/21day ecff84c] 111
 1 file changed, 1 insertion(+)
[root@istester istester_idoxu6]# git checkout master 
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
[root@istester istester_idoxu6]# 

2、也可以强制切换分支 ，

执行如下，

[root@istester istester_idoxu6]# git checkout master 
error: Your local changes to the following files would be overwritten by checkout:
        idoxu.ini
Please commit your changes or stash them before you switch branches.
Aborting
[root@istester istester_idoxu6]# git checkout -f master 
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
[root@istester istester_idoxu6]# git branch
  istester/21day
  istester/git21day
* master
[root@istester istester_idoxu6]#