git pull origin master --allow-unrelated-histories 就用了这个命令之后,代码就像下面这样了
<<<<<<< HEAD
<packaging>pom</packaging>
=======
>>>>>>> f747b9abc039ca8dd1534a3ef182523d3389d31e
<version>1.0-SNAPSHOT</version>
<modules>
<module>tanhua-commons</module>
<module>tanhua-domain</module>
<module>tanhua-mapper</module>
<module>tanhua-db-interface</module>
<module>tanhua-db-service</module>
<module>tanhua-autoconfig</module>
<module>tanhua-app</module>
<module>tanhua-mongo-interface</module>
<module>tanhua-mongo-service</module>
<<<<<<< HEAD
<module>tanhua-admin</module>
<module>tanhua-recommend</module>
<module>tanhua-soul</module>
</modules>
=======
</modules>
<packaging>pom</packaging>
>>>>>>> f747b9abc039ca8dd1534a3ef182523d3389d31e
<!--springboot父工程-->
![img](https://img-mid.csdnimg.cn/release/static/image/mid/ask/26168290352610.8146279731804873.png)