must be "pom" but is "jar"
<packaging>pom</packaging>
Please move or remove them before you can merge.
Aborting
git clean -d -fx ""
其中
x -----删除忽略文件已经对git来说不识别的文件
d -----删除未被添加到git的路径中的文件
f -----强制运行
拒绝提交申请的时候 Git Merge Failed: refusing to merge unrelated histories
git merge devlop --allow-unrelated-histories