git pull 出现问题

7900405

用的阿木的ios，虚拟机安装。在master分支下，

~/project/some/Firmware$ git pull
最后出现以下问题：
Auto-merging .gitmodules
CONFLICT (content): Merge conflict in .gitmodules
Automatic merge failed; fix conflicts and then commit the result.

再次git pull，
~/project/some/Firmware$ git pull
如下所示：
error: Pulling 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.


求问

eason

固件少更新或儘量不更，報錯信息百度可自理解