简体繁体 English

development.rb未提交

[英]git pull says config/environments/development.rb is not committed

原文 2013-08-02 14:57:24 3 3 ruby-on-rails/ git

Doing a pull from master into my local branch on a shared ROR project. 在共享的ROR项目上从master拉到我的本地分支。 Git says: Git说：

branch master -> FETCH_HEAD error: Your local changes to the following files would be overwritten by merge: config/environments/development.rb Please, commit your changes or stash them before you can merge. 分支主管-> FETCH_HEAD错误：您对以下文件的本地更改将被merge覆盖：config / environments / development.rb请在合并之前提交更改或存储它们。 Aborting 堕胎

development.rb is not showing up as having been modified, and, in fact, when I actually do modify it, it still doesn't show as having been modified. development.rb没有显示为已修改，实际上，当我实际对其进行修改时，它仍然没有显示为已修改。 This is happening on all branches, effectively preventing me from merging in master. 这发生在所有分支机构上，有效地阻止了我与master合并。

I should say here that I am a designer on this project and my ROR and Git skills are not huge (I have mostly been using the Tower GUI for managing branches). 在这里我应该说我是这个项目的设计师，我的ROR和Git技能也不是很多（我一直在使用Tower GUI来管理分支）。 However, I've been successfully contributing to the project for over a year and never came across this issue before. 但是，我已经为该项目成功贡献了超过一年的时间，之前从未遇到过这个问题。

3 个解决方案

If you type 'git status' do you see development.rb in the list of untracked files? 如果输入“ git status”，您是否在未跟踪文件列表中看到development.rb？ If so you need to 'git add' it and commit. 如果是这样，您需要对其进行“ git add”并提交。

Alternately, in the root of your project look at .gitignore and see if it's listed in there for some weird reason. 或者，在项目的根目录中查看.gitignore，并查看它是否出于某些奇怪的原因而在其中列出。 It shouldn't be, but it's worth looking. 它不应该，但是值得一看。

My gut feeling that you are using git update-index --assume-unchanged development.rb , but don't remember it. 我的直觉是您使用的是git update-index --assume-unchanged development.rb ，但是不记得了。 If it is the case, use --no-assume-unchanged then. 如果是这种情况，请使用--no-assume-unchanged 。

It is hard to say without looking at your .gitignore but you could have config/environments/development.rb in that file, in which case you wouldn't see changes. 不查看.gitignore很难说，但是您可以在该文件中包含config / environments / development.rb，在这种情况下，您将看不到更改。

But that isn't the real issue, it sounds like you just need to commit then pull. 但这不是真正的问题，听起来您只需要先提交然后再拉。 This is what I would do. 这就是我要做的。

Add config/environments/development.rb to your commit, commit changes then pull. 将config / environments / development.rb添加到您的提交中，提交更改然后拉。 If that doesn't work, I would just delete your local copy and clone a new one. 如果那不起作用，我将删除您的本地副本并克隆一个新副本。

I hope that helps. 希望对您有所帮助。