当我执行
当我执行
git status
命令时,我发现有一些文件有本地更改(似乎是缩进更改)。当我执行
git stash
命令时,它并不会将这些文件从队列中移除。它会阻止我的自动拉取脚本从远程git获取更新。$ git stash
Saved working directory and index state WIP on develop: 05c60a5 Merge remote-tracking branch 'origin/develop' into develop
HEAD is now at 05c60a5 Merge remote-tracking branch 'origin/develop' into develop
$ git stash
On branch develop
Your branch and 'origin/develop' have diverged and have 23 and 127 different commit(s) each, respectively.
Changed but not updated:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: config/buznames/businessname_map.
modified: public/css/_lib/dropdown.less
modified: public/css/_lib/secureBadge.less
git diff
命令来查看有何不同。是缩进还是行结尾? - pokegit checkout -- file
似乎对那些文件也不起作用。 - sonicMandelBrot.gitattributes
的文件吗?另外,git config core.autocrlf
显示什么? - pokegit config core.autocrlf
命令并设置为 "true"。 - sonicMandelBrot