我有一个git问题,我想将分支合并到主服务器中,但拒绝合并,因为它认为我对文件进行了本地更改。执行状态显示没有变化,并且区分文件不会产生任何结果。这里的终端输出:Git拒绝合并,因为对未更改文件的更改
$ git checkout ProductsAndContents
Switched to branch 'ProductsAndContents'
$ git status
# On branch ProductsAndContents
nothing to commit (working directory clean)
$ git checkout master
Switched to branch 'master'
$ git status
# On branch master
nothing to commit (working directory clean)
$ git merge ProductsAndContents
error: Your local changes to the following files would be overwritten by merge:
tests/unit/src/models/BrandTests.js
Please, commit your changes or stash them before you can merge.
Aborting
任何帮助或建议将不胜感激!
你有没有设法将该文件放在'.git/info/exclude'文件或'.gitignore'文件中? – 2013-03-01 19:18:36
[此答案](http://stackoverflow.com/a/12167041/166732)中的配置选项有帮助吗? – asm 2013-03-01 19:20:13
嗨安德鲁,设置'core.trustctime'为false似乎已经做到了。感谢您指点我正确的方向:) – 2013-03-04 15:03:11