나는 그들의 가이드의 양쪽을 따라 서버에. 튜토리얼을 따라 Git을 사용하여 배포해야한다. 여기 아무런 문제가 없으므로 프로젝트 디렉토리 git add .
을 추가하여 git commit -a -m "OS Deploy"
을 작성한 다음 Git push
을 만들었지 만,이 방법은 내 OpenShift 응용 프로그램의 주소를 어디서 찾을 수 있을지 모르겠다.OpenShift는 배포 로컬 응용 프로그램
그래서 로컬 컴퓨터에서 OpenShift 응용 프로그램으로 코드를 전송하는 방법을 모릅니다.
응용 프로그램을 배포하려면 어떻게해야합니까? 또한 단순히 git repo에서 코드를 가져올 수 있습니까? 내가 OpenShift에 내 로컬 응용 프로그램을 추진하려고 할 때 내가 얻을 ssh://***[email protected] -eveonline.rhcloud.com/~/git/corporation.git/
:
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 오류
당신은 여기 내 게시물을 볼 수 있습니다 http://stackoverflow.com/questions/17727788/deploying-ruby-on-rails-is-there-a-good-alternative-for-heroku 당신은 내 게시물을 볼 수 있습니다 – obenda
여기 http://stackoverflow.com/questions/17727788/deploying-ruby-on-rails-is-there-a-good-alternative-for-heroku – obenda