idea项目中拉取远程仓库时报错“error: Your local changes to the following files would be overwritten by merge:”

“<stdin>:61: new blank line at EOF.
+
<stdin>:296: new blank line at EOF.
+
<stdin>:387: new blank line at EOF.
+
warning: 3 lines add whitespace errors.
Merge with strategy ort failed.”

问题背景：在idea创建的工作空间中使用命令“git pull userLogin master --allow-unrelated-histories”拉取远程仓库时报错

问题原因：配置文件.idea/workspace.xml一直处于被修改的状态

解决方案：commit项目时不选择.idea目录