有些东西不断重写我的 Gemfile.lock [重复]

Question

在处理共享项目时，我经常发现我的Gemfile.lock 与存储库不同步，产生如下错误消息：

$ git pull
Updating 1911275..8c5d26f
error: Your local changes to the following files would be overwritten by merge:
    Gemfile.lock
Please commit your changes or stash them before you merge.
Aborting

当我尝试git stash 更改时，它不起作用：

$ git stash
Saved working directory and index state WIP on development: 1911275 Merge branch 'development' of https://github.com/mygroup/myrepo into development
HEAD is now at 1911275 Merge branch 'development' of https://github.com/mygroup/myrepo into development
$ git status
On branch development
Your branch is behind 'origin/development' by 3 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

    modified:   Gemfile.lock

no changes added to commit (use "git add" and/or "git commit -a")

如果我足够快地stash 和status，我可以看到更改正在被隐藏：

$ git stash && git status
Saved working directory and index state WIP on development: 1911275 Merge branch 'development' of https://github.com/mygroup/myrepo into development
HEAD is now at 1911275 Merge branch 'development' of https://github.com/mygroup/myrepo into development
On branch development
Your branch is behind 'origin/development' by 3 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
nothing to commit, working tree clean

但是另一个status 显示Gemfile.lock 已经回来了：

$ git status
On branch development
Your branch is behind 'origin/development' by 3 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

    modified:   Gemfile.lock

no changes added to commit (use "git add" and/or "git commit -a")

不幸的是，同样的技巧不适用于git stash && git pull； pull太慢了，拉取成功之前锁文件重新出现。

我认为这可能是我的 IDE 在后台重新捆绑，但无论 IDE 是否正在运行，都会发生这种情况。我找不到任何正在运行的捆绑程序进程、gem 进程或任何明显的任何类型的 Ruby 进程。

谁或什么正在重新生成我的文件？

Answer 1

找到罪魁祸首，感谢this answer（this answer 同意）：Spring。我的机器上有六个流氓spring 进程，它们中的任何一个或全部肯定在重新生成文件。杀死这些进程解决了这个问题，到目前为止，将export DISABLE_SPRING=1 添加到我的.bash_profile 似乎可以防止它再次发生。

（spring stop 可能也有效。不过，我不知道它是停止所有 Spring 进程还是仅停止其中一个。）