Your application code is now in 'plone'
root@debian:/home/renato# cd plone/
root@debian:/home/renato/plone# git remote add upstream -m master https://github.com/kagesenshi/plone-openshift-quickstart.git
root@debian:/home/renato/plone# git pull -s recursive -X theirs upstream master
warning: no common commits
remote: Counting objects: 174, done.
remote: Compressing objects: 100% (96/96), done.
remote: Total 174 (delta 78), reused 170 (delta 75)
Receiving objects: 100% (174/174), 26.32 KiB, done.
Resolving deltas: 100% (78/78), done.
From https://github.com/kagesenshi/plone-openshift-quickstart
 * branch            master     -> FETCH_HEAD
Auto-merging diy/index.html
Auto-merging .openshift/action_hooks/stop
Auto-merging .openshift/action_hooks/start
Merge made by the 'recursive' strategy.
 .openshift/action_hooks/build       |    6 +++
 .openshift/action_hooks/deploy      |   59 +++++++++++++++++++++
 .openshift/action_hooks/post_deploy |    4 ++
 .openshift/action_hooks/pre_build   |    5 ++
 .openshift/action_hooks/start       |   15 ++++--
 .openshift/action_hooks/stop        |   14 ++---
 README                              |   53 +++++++++++++++++++
 README.rst                          |   76 +++++++++++++++++++++++++++
 bootstrap.py                        |  181 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 buildout.cfg                        |   42 +++++++++++++++
 diy/index.html                      |    4 +-
 11 files changed, 447 insertions(+), 12 deletions(-)
 create mode 100755 .openshift/action_hooks/build
 create mode 100755 .openshift/action_hooks/deploy
 create mode 100755 .openshift/action_hooks/post_deploy
 create mode 100755 .openshift/action_hooks/pre_build
 create mode 100644 README
 create mode 100644 README.rst
 create mode 100644 bootstrap.py
 create mode 100644 buildout.cfg
root@debian:/home/renato/plone#