git合并冲突解决

使用IDEA合并其它分支代码过程中，虽然在界面处理文件时都解决了冲突，但合并完成后还是报错冲突，状态一直为mergeing,下面记录下解决过程

	Couldn't check the working tree for unmerged files because of an error.
		error: Committing is not possible because you have unmerged files.
		hint: Fix them up in the work tree, and then use 'git add/rm <file>'
		hint: as appropriate to mark resolution and make a commit.
		fatal: Exiting because of an unresolved conflict.

解决方法
1.git status

红色是需要解决冲突的的文件，根据需要 git add file1 file2或者git rm file1 file2，解决完所有冲突文件

git add   tbd-hive/src/main/java/cn/touna/tbd/hive/ql/udf/UDFDecryptNew.java  tbd-hive/src/main/java/cn/touna/tbd/hive/ql/udf/UDFEncryptNew.java

2. git commit

问题解决