我遇到了一个git问题,我想把一个分支合并到主分支,但它拒绝合并,因为它认为我对文件进行了本地更改。执行status命令显示没有更改,并且比较文件也没有产生任何变化。以下是终端输出结果:
任何帮助或建议都将不胜感激!
$ 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
文件中? - Jonathan Wakelycore.trustctime
设置为 false 似乎解决了问题。谢谢你指引我正确的方向 :) - Mark Stickley