我有配置文件:conf/local.conf我为其运行下一个命令:
git update-index --assume-unchanged local.conf可以,直到我切换到另一个分支或拉动.
如何在分支之间保留--assume-unchanged标志?
UPD 发生什么事的一些示例:
$ git checkout 296-ToS-component error: Your local changes to the following files would be overwritten by checkout: conf/local.conf Please commit your changes or stash them before you switch branches. Aborting $ git checkout -f 296-ToS-component error: Entry 'conf/local.conf' not uptodate. Cannot merge.我希望它可以用作下一个:
解决方案
请勿使用--assume-unchanged来解决性能问题,因为大文件不会发生变化,并且执行git status时散列的开销很大. /p>
您想要的是--skip-worktree,它们可以执行几乎相同的操作,但可以处理您已更改但不想提交的文件.
请参见 stackoverflow/a/13631525/717372
这可能(不确定,但是,嘿,那是您必须要做的...)解决您的问题...
I have config file: conf/local.conf I run next command for it:
git update-index --assume-unchanged local.confand it is OK until I switch to another branch or pull.
How to preserve --assume-unchanged flag between branches?
UPD Some examples what is coming on:
$ git checkout 296-ToS-component error: Your local changes to the following files would be overwritten by checkout: conf/local.conf Please commit your changes or stash them before you switch branches. Aborting $ git checkout -f 296-ToS-component error: Entry 'conf/local.conf' not uptodate. Cannot merge.I want it works as next:
解决方案
Don't use --assume-unchanged that should be used for performance problem for big files not changing and that are costly to hash when doing a git status.
What you want is --skip-worktree that do nearly the same things but to handle files that you changed but don't want to commit.
See stackoverflow/a/13631525/717372
And it will probably (not sure, but hey!, that's what you must do...) fix your problem...
更多推荐
如何在项目中“
发布评论