Red Hat Bugzilla – Bug 812514
Unable to install quick-start application: myshoppinglist
Last modified: 2015-05-14 21:51:08 EDT
Description of problem: I'm unable to use and install a quick-start example applicaion (myshoppinglist) which was uploaded to openshift repository on GitHub. Git pull operation returns error.
warning: no common commits
* branch master -> FETCH_HEAD
CONFLICT (add/add): Merge conflict in .openshift/action_hooks/build
CONFLICT (add/add): Merge conflict in .openshift/action_hooks/deploy
CONFLICT (add/add): Merge conflict in .openshift/action_hooks/post_deploy
CONFLICT (add/add): Merge conflict in .openshift/action_hooks/pre_build
CONFLICT (add/add): Merge conflict in .openshift/cron/weekly/chronograph
Automatic merge failed; fix conflicts and then commit the result.
Version-Release number of selected component (if applicable):
How reproducible: Always
Steps to Reproduce:
1. rhc-create-app -a myshoppinglist -t python-2.6
2. rhc-ctl-app -a myshoppinglist -e add-mongodb-2.0
3. cd myshoppinglist
4. git remote add upstream -m master git://github.com/openshift/openshift-myshoppinglist.git
5. git pull -s recursive -X theirs upstream master
Actual results: Git returns error (See above)
Expected results: Git pull operation must be successfull
This looks like your repository is messed up (your local one). Before you created the shopping list was there a git repository at the relative folder "myshoppinglist"?
There was no directory like 'myshoppinglist'. The local working copy is the one which was cloned just after the application was created with 'rhc app create'.
Fixed in github
Fix is verified