【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 files
		You 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 dev
		The following untracked working tree files would be overwritten by checkout:
		ciaowarm-commons/src/main/java/com/iwarm/common/distributor/pojo/second/SecondAgentApplySimpleReturn.java
		distributor/distributor-server/src/main/java/com/iwarm/distributor/rest/util/UUidUtil.java
		Please move or remove them before you switch branches.
		Aborting

在当前开发分支将新建的文件add进缓存区，commit，再merge，pull，push