git checkout bthss_V3.0.4
error: Your local changes to the following files would be overwritten by checkout:
bthss-dao/src/main/java/com/xxx/bthss/dao/SettleOrderDao.java
Please commit your changes or stash them before you switch branches.
Aborting
Auto-merging index.html
CONFLICT (content): Merge conflict in index.html
Automatic merge failed; fix conflicts and then commit the result.//使用 git status 命令来查看那些因包含合并冲突而处于未合并(unmerged)状态的文件
git status
On branch master
You have unmerged paths.(fix conflicts and run "git commit")
Unmerged paths:(use "git add <file>..." to mark resolution)
both modified: index.html
no changes added to commit (use "git add" and/or "git commit -a")