Bug 997883 - Met "merge conflict" error when creating "Wordpress By Jitesh" quickstart application.
Met "merge conflict" error when creating "Wordpress By Jitesh" quickstart app...
Status: CLOSED NOTABUG
Product: OpenShift Online
Classification: Red Hat
Component: Templates (Show other bugs)
2.x
Unspecified Unspecified
medium Severity medium
: ---
: ---
Assigned To: Dan McPherson
libra bugs
:
Depends On:
Blocks:
  Show dependency treegraph
 
Reported: 2013-08-16 07:30 EDT by Yujie Zhang
Modified: 2015-05-14 22:24 EDT (History)
1 user (show)

See Also:
Fixed In Version:
Doc Type: Bug Fix
Doc Text:
Story Points: ---
Clone Of:
Environment:
Last Closed: 2013-08-16 22:22:23 EDT
Type: Bug
Regression: ---
Mount Type: ---
Documentation: ---
CRM:
Verified Versions:
Category: ---
oVirt Team: ---
RHEL 7.3 requirements from Atomic Host:
Cloudforms Team: ---


Attachments (Terms of Use)

  None (edit)
Description Yujie Zhang 2013-08-16 07:30:50 EDT
Description of problem:

Tried to create "Wordpress By Jitesh" application, but met "merge conflict" error as following:

[root@dhcp-8-252 wordnew2]# git pull -s recursive -X theirs upstream master
warning: no common commits
remote: Counting objects: 66, done.
remote: Compressing objects: 100% (37/37), done.
remote: Total 66 (delta 22), reused 64 (delta 20)
Unpacking objects: 100% (66/66), done.
From git://github.com/aparichit/wp-openshift
 * branch            master     -> FETCH_HEAD
Auto-merging .openshift/cron/weekly/chronograph
CONFLICT (add/add): Merge conflict in .openshift/cron/weekly/chronograph
Auto-merging .openshift/cron/README.cron
Automatic merge failed; fix conflicts and then commit the result.

Version-Release number of selected component (if applicable):
devenv_3660

How reproducible:
always

Steps to Reproduce:
1.rhc app create aaa php-5 mysql-5
2.git remote add upstream -m master git://github.com/aparichit/wp-openshift.git
3.git pull -s recursive -X theirs upstream master


Actual results:

[root@dhcp-8-252 wordnew2]# git pull -s recursive -X theirs upstream master
warning: no common commits
remote: Counting objects: 66, done.
remote: Compressing objects: 100% (37/37), done.
remote: Total 66 (delta 22), reused 64 (delta 20)
Unpacking objects: 100% (66/66), done.
From git://github.com/aparichit/wp-openshift
 * branch            master     -> FETCH_HEAD
Auto-merging .openshift/cron/weekly/chronograph
CONFLICT (add/add): Merge conflict in .openshift/cron/weekly/chronograph
Auto-merging .openshift/cron/README.cron
Automatic merge failed; fix conflicts and then commit the result.

Expected results:

The application should be created successfully.

Additional info:
Comment 1 Dan McPherson 2013-08-16 22:22:23 EDT
Hi Yujie,

  We don't take bugs against non openshift quickstarts in bugzilla.  I would suggest opening this as an issue on the offending github repo.

-Dan

Note You need to log in before you can comment on or make changes to this bug.