OpenShift 部署本地应用程序答案

【问题标题】：OpenShift deploying local applicationOpenShift 部署本地应用程序
【发布时间】：2013-04-05 21:14:36
【问题描述】：

我遵循了他们的两个指南：

设置 RHC gem Here
设置私钥/公钥和 Putty Here

但是我无法将我的 rails 应用程序部署到服务器。按照他们的教程，我必须使用 Git 部署它。这里没问题，所以我添加了我的项目目录git add . 提交了git commit -a -m "OS Deploy" 然后Git push 但这不起作用，因为我不知道在哪里可以找到我的OpenShift应用程序的地址。

所以我不知道如何将代码从本地机器传输到 OpenShift 应用程序。

如何部署我的应用程序。也可以简单地从我的 git repo 中提取代码吗？

我找到了我的应用地址：ssh://***094@corporation -eveonline.rhcloud.com/~/git/corporation.git/

但是，当我尝试将本地应用程序推送到 OpenShift 时，我得到：

warning: no common commits
remote: Counting objects: 420, done.
remote: Compressing objects: 100% (202/202), done.
remote: Total 420 (delta 186), reused 420 (delta 186)
Receiving objects: 100% (420/420), 140.16 KiB | 138 KiB/s, done.
Resolving deltas: 100% (186/186), done.
From ssh://corporation-eveonline.rhcloud.com/~/git/corporation
 * branch            HEAD       -> FETCH_HEAD
Auto-merging script/rails
CONFLICT (add/add): Merge conflict in script/rails
Auto-merging config/routes.rb
CONFLICT (add/add): Merge conflict in config/routes.rb
Auto-merging config/initializers/session_store.rb
CONFLICT (add/add): Merge conflict in config/initializers/session_store.rb
Auto-merging config/initializers/secret_token.rb
CONFLICT (add/add): Merge conflict in config/initializers/secret_token.rb
Auto-merging config/environments/test.rb
CONFLICT (add/add): Merge conflict in config/environments/test.rb
Auto-merging config/environments/production.rb
CONFLICT (add/add): Merge conflict in config/environments/production.rb
Auto-merging config/environments/development.rb
CONFLICT (add/add): Merge conflict in config/environments/development.rb
Auto-merging config/environment.rb
CONFLICT (add/add): Merge conflict in config/environment.rb
Auto-merging config/database.yml
CONFLICT (add/add): Merge conflict in config/database.yml
Auto-merging config/application.rb
CONFLICT (add/add): Merge conflict in config/application.rb
Auto-merging config.ru
CONFLICT (add/add): Merge conflict in config.ru
Auto-merging app/views/layouts/application.html.erb
CONFLICT (add/add): Merge conflict in app/views/layouts/application.html.erb
Auto-merging app/controllers/application_controller.rb
CONFLICT (add/add): Merge conflict in app/controllers/application_controller.rb
Auto-merging app/assets/stylesheets/application.css
CONFLICT (add/add): Merge conflict in app/assets/stylesheets/application.css
Auto-merging Rakefile
CONFLICT (add/add): Merge conflict in Rakefile
Auto-merging README.md
CONFLICT (add/add): Merge conflict in README.md
Auto-merging Gemfile.lock
CONFLICT (add/add): Merge conflict in Gemfile.lock
Auto-merging Gemfile
CONFLICT (add/add): Merge conflict in Gemfile
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Automatic merge failed; fix conflicts and then commit the result.

所以我再次尝试推送到我的应用地址，但没有收到该错误，但我确实收到了： https://gist.github.com/nered/82d7ca1fa334617210c1错误

【问题讨论】：

你可以在这里看到我的帖子stackoverflow.com/questions/17727788/…
你可以在这里看到我的帖子stackoverflow.com/questions/17727788/…

标签： ruby-on-rails ruby-on-rails-3 ruby-on-rails-3.2 openshift

【解决方案1】：

你想要做的是Sync new git repo with your own existing git repo。

【讨论】：

【解决方案2】：

您是否查看过在 Ruby 开发人员中心找到的资源？ https://www.openshift.com/developers/ruby

您可以在部署自己的代码之前尝试使用快速入门 (https://github.com/openshift/rails-example)，以熟悉如何部署 Rails 应用程序。在快速入门之后，您可以查看博客，看看它们是否也有帮助。

【讨论】：