I'm trying to recover from a branch-merge disaster in Git; I couldn't merge my topic branch to the master because of a "merge conflict in gemfile.lock". While looking for solutions to this I read in a blog post that using the "bundle lock" command would help (I didn't know it was obsolete), and when I used it I was alerted that "Lock is deprecated. Your bundle is now locked whenever you run 'bundle install'".
我正试图从Git中的分支合并灾难中恢复过来;由于“gemfile.lock中的合并冲突”,我无法将主题分支合并到主分支。在寻找解决方案时,我在博客文章中读到,使用“bundle lock”命令会有所帮助(我不知道它已经过时了),当我使用它时,我被警告“Lock已被弃用。你的捆绑是现在只要你运行'bundle install'就锁定了。“
So I ended up merging my topic branch, but when I try to access the rails server I get an error involving bundler. I'm assuming that it's because my bundle is locked. Running 'bundle unlock' doesn't do anything.
所以我最终合并了我的主题分支,但是当我尝试访问rails服务器时,我得到一个涉及bundler的错误。我假设这是因为我的包被锁定了。运行'捆绑解锁'不会做任何事情。
Is there anything else I can try?
还有什么我可以尝试的吗?
1 个解决方案
#1
3
I don't think there is an unlock anymore. You can unlock by removing the Gemfile.lock file.
我认为不再有解锁了。您可以通过删除Gemfile.lock文件来解锁。
You need to resolve the Gemfile.lock in git. Do anything you need to, in order for git to accept a Gemflie.lock. Then, update to the current revision of the git branch, redo bundle install, and check in the new Gemfile.lock.
你需要在git中解决Gemfile.lock。做任何你需要的东西,以便让git接受一个Gemflie.lock。然后,更新到git分支的当前版本,重做bundle install,并检入新的Gemfile.lock。
#1
3
I don't think there is an unlock anymore. You can unlock by removing the Gemfile.lock file.
我认为不再有解锁了。您可以通过删除Gemfile.lock文件来解锁。
You need to resolve the Gemfile.lock in git. Do anything you need to, in order for git to accept a Gemflie.lock. Then, update to the current revision of the git branch, redo bundle install, and check in the new Gemfile.lock.
你需要在git中解决Gemfile.lock。做任何你需要的东西,以便让git接受一个Gemflie.lock。然后,更新到git分支的当前版本,重做bundle install,并检入新的Gemfile.lock。