error: The following untracked working tree files would be overwritten by merge:
.DS_Store
Please move or remove them before you can merge.
執(zhí)行下面的命令
git clean -d -fx?
在git pull 就可以了.
error: The following untracked working tree files would be overwritten by merge:
.DS_Store
Please move or remove them before you can merge.
執(zhí)行下面的命令
git clean -d -fx?
在git pull 就可以了.