eZ Community » Forums » eZ Platform » Upgrade process
expandshrink

Upgrade process

Upgrade process

Thursday 13 October 2016 11:58:22 pm

Hi all

My first site using ezplatform is about to go live in the next few days... But there is something that I have not yet managed to do, without spending more hours then I can afford.

I am running ezplatform 1.4 both in dev and in production. I wish to upgrade both environments to 1.5

Which is the best way to achieve that?

My installation was made through composer. I am now trying to upgrade following the composer based instructions in https://doc.ez.no/display/DEVELOPER/Updating+eZ+Platform, but I keep getting loads of merge failures.

 mic-w:ezplatform tretas$ git pull ezplatform v1.5.0
From http://github.com/ezsystems/ezplatform
 * tag               v1.5.0     -> FETCH_HEAD
Removing doc/docker-compose/dev.yml
Auto-merging doc/docker-compose/base-prod.yml
Auto-merging composer.json
Auto-merging app/config/security.yml
CONFLICT (content): Merge conflict in app/config/security.yml
Auto-merging app/config/routing_dev.yml
CONFLICT (rename/delete): app/config/env/docker.php deleted in HEAD and renamed in bbb1b53bfa1a8171059e60a333fd40ca5827f12a. Version bbb1b53bfa1a8171059e60a333fd40ca5827f12a of app/config/env/docker.php left in tree.
Auto-merging app/config/default_parameters.yml
CONFLICT (content): Merge conflict in app/config/default_parameters.yml
Auto-merging app/config/config.yml
CONFLICT (content): Merge conflict in app/config/config.yml
CONFLICT (modify/delete): app/config/cache_pool/singleredis.yml deleted in HEAD and modified in bbb1b53bfa1a8171059e60a333fd40ca5827f12a. Version bbb1b53bfa1a8171059e60a333fd40ca5827f12a of app/config/cache_pool/singleredis.yml left in tree.
CONFLICT (modify/delete): app/config/cache_pool/singlememcached.yml deleted in HEAD and modified in bbb1b53bfa1a8171059e60a333fd40ca5827f12a. Version bbb1b53bfa1a8171059e60a333fd40ca5827f12a of app/config/cache_pool/singlememcached.yml left in tree.
Automatic merge failed; fix conflicts and then commit the result.

Thank you, in advance, for your input

Io

No reply yet!

expandshrink

You must be logged in to post messages in this topic!

36 542 Users on board!

Forums menu

Proudly Developed with from