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

問題解決