本文主要是介绍【idea Git解决】these untracked files would be overweitten by checkout，希望对大家解决编程问题提供一定的参考价值，需要的开发者们随着小编来一起学习吧！
master分支
开发分支(开发环境和测试环境使用)
dev分支(开发分支新建分支开发新功能)
缘由：
在dev分支开发时，建了两个新的类，add ，commit后，切换回开发分支，pull，merge，push，无法push成功，并且在切换回dev分支时切换不成功，报如下错误
these untracked files would be overweitten by checkout
9:18 Can't checkout because of unmerged filesYou have to resolve all merge conflicts before checkout.After resolving conflicts you also probably would want to commit your files to the current branch.9:27 Couldn't checkout devThe following untracked working tree files would be overwritten by checkout:ciaowarm-commons/src/main/java/com/iwarm/common/distributor/pojo/second/SecondAgentApplySimpleReturn.javadistributor/distributor-server/src/main/java/com/iwarm/distributor/rest/util/UUidUtil.javaPlease move or remove them before you switch branches.Aborting
解决：
在当前开发分支将新建的文件add进缓存区，commit，再merge，pull，push
这篇关于【idea Git解决】these untracked files would be overweitten by checkout的文章就介绍到这儿，希望我们推荐的文章对编程师们有所帮助！
