I decided (stupidly) to upgrade Sencha Cmd to 4.0.1 so I could use Ruby 2.0 on OS X Mavericks at last... BIG mistake!
I've got an app I build with Sencha Cmd 4.0.0 and it's using Cordova to run native.
I used terminal to move into my project root and ran:
sencha app upgrade
I get the following saying there's a merge conflict with the .sencha/app/build.properties and the .sencha/app/native.properties files, neither of which I've ever touched or opened, and I've no idea what I'm supposed to be manually resolving as recommended by the output of Sencha Cmd.....:
Sencha Cmd v184.108.40.206
[INF] building application
[INF] Backing up application files from /Users/james/Documents/MyApps/Touch23/MyApp to /Users/james/Documents/MyApps/Touch23/MyApp/.sencha_backup/MyApp/2.3.0
[INF] [copy] Copying 336 files to /Users/james/Documents/MyApps/Touch23/MyApp/.sencha_backup/MyApp/2.3.0
[INF] [copy] Copied 340 empty directories to 1 empty directory under /Users/james/Documents/MyAppx/Touch23/MyApp/.sencha_backup/MyApp/2.3.0
[INF] Updating application and workspace files
[ERR] MERGE CONFLICT - /Users/james/Documents/MyApps/Touch23/MyApp/.sencha/app/build.properties
[ERR] Please resolve manually
[ERR] MERGE CONFLICT - /Users/james/Documents/MyApps/Touch23/MyApp/.sencha/app/native.properties
[ERR] Please resolve manually
[INF] [x-property-file] Updating property file: /Users/james/Documents/MyApps/Touch23/MyApp/.sencha/app/sencha.cfg
[ERR] com.sencha.exceptions.ExScript: Wrapped com.sencha.exceptions.BasicException: Upgrade encountered 2 merge conflicts. Please resolve all merge conflicts then run 'sencha app refresh'. (/Users/james/bin/Sencha/Cmd/220.127.116.11/ant/ant-util.js#849)
The application was last modified by an older version of Sencha Cmd (18.104.22.168)
the current is 22.214.171.124.
Please run "sencha app upgrade" to update to 126.96.36.199.
I've never modified (or even looked at) the two files concerned, and there's no indication of what the issue may be, but it's now broken my app and I'm unable to build. I've tried rolling back to a previous version and restoring Sencha Cmd 4.0.0 but even after doing this I still can't build the native version, so my only option is to press on with upgrading to Cmd 4.0.1 but I don't know what I'm supposed to be resolving manually...
The contents of the files is:
# This file provides an override point for default variables defined in these
# lower priority files:
# - touch.properties
# - *.defaults.properties
# - defaults.properties
# To override a property based on build.environment instead add properties to
# one of these higher priority files:
# - production.properties
# - testing.properties
# - native.properties
# - package.properties
# IMPORTANT - Sencha Cmd will merge your changes with its own during upgrades.
# To avoid potential merge conflicts avoid making large, sweeping changes to
# this file.
# override the default sass directory
This is the contents of native.properties:
# This file provides an override point for default variables defined in
# native.defaults.properties. These properties are only imported when building
# for the "native" environment.
# Properties defined in this file take priority over build.properties but are
# only loaded for "native" builds.
# enable yui compression
Any help greatly appreciated as I'm desperate to get this resolved as I have to build today!!