iOS sourceTree 拉取代码 DS_Store

error: The following untracked working tree files would be overwritten by merge:

.DS_Store

Please move or remove them before you can merge.

执行下面的命令

git clean -d -fx​

在git pull 就可以了.

你可能感兴趣的:(iOS sourceTree 拉取代码 DS_Store)