gistfile1.sh

jroes work$ rhc app create -a railsapp2 -t ruby-1.9 && rhc cartridge add -a railsapp2 -c mysql-5.1 && cd railsapp2 && git remote add upstream -m master git://github.com/openshift/rails-example.git && git pull -s recursive -X theirs upstream master
Password: **************

Creating application 'railsapp2'
================================

  Namespace: skookum
  Cartridge: ruby-1.9
  Gear Size: default
  Scaling:   no

Your application's domain name is being propagated worldwide (this might take a minute)...
The authenticity of host 'railsapp2-skookum.rhcloud.com (107.22.107.203)' can't be established.
RSA key fingerprint is cf:ee:77:cb:0e:fc:02:d7:72:7e:ae:80:c0:90:88:a7.
Are you sure you want to continue connecting (yes/no)? yes
Cloning into 'railsapp2'...
done

railsapp2 @ http://railsapp2-skookum.rhcloud.com/
=================================================
  Application Info
  ================
    Created   = 12:17 PM
    UUID      = 55d5ca65387043fb882b13d1d68b13be
    Gear Size = small
    Git URL   = ssh://[email protected]/~/git/railsapp2.git/
    SSH URL   = ssh://[email protected]
  Cartridges
  ==========
    ruby-1.9

RESULT:
Application railsapp2 was created.

Password: **************

Adding 'mysql-5.1' to application 'railsapp2'
Success
mysql-5.1
=========
  Properties
  ==========
    Username       = admin
    Password       = D8YDkuNkykAX
    Database Name  = railsapp2
    Connection URL = mysql://127.3.244.129:3306/
warning: no common commits
remote: Counting objects: 355, done.
remote: Compressing objects: 100% (205/205), done.
remote: Total 355 (delta 144), reused 318 (delta 118)
Receiving objects: 100% (355/355), 132.80 KiB, done.
Resolving deltas: 100% (144/144), done.
From git://github.com/openshift/rails-example
 * branch            master     -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
fatal: Could not parse object 'bab6f7c11a25ff1ce99d7b49784f54b993ab8c75^'
Unknown exit code (128) from command: git-merge-recursive bab6f7c11a25ff1ce99d7b49784f54b993ab8c75^ -- HEAD bab6f7c11a25ff1ce99d7b49784f54b993ab8c75
jroes railsapp2.master|REBASE-m$