1. #1
    Sencha Premium Member
    Join Date
    Feb 2012
    Location
    Berne, Switzerland
    Posts
    721
    Vote Rating
    45
    ingo.hefti has a spectacular aura about ingo.hefti has a spectacular aura about ingo.hefti has a spectacular aura about

      0  

    Default [3.1.0.256] Merge Conflicts when upgrading Touch project

    Am I the only one to find this very annoying when upgrading a project some of your files (like app.js) are 'upgraded'? After that the app.js is a mess. And all this just because there is one or two lines missing? I would prefer to have a copy or a sample file in the directory. ST2.1.1.

    26-03-2013 18-09-36.png

  2. #2
    Sencha - Senior Software Engineer mitchellsimoens's Avatar
    Join Date
    Mar 2007
    Location
    Gainesville, FL
    Posts
    38,215
    Vote Rating
    1044
    mitchellsimoens has a reputation beyond repute mitchellsimoens has a reputation beyond repute mitchellsimoens has a reputation beyond repute mitchellsimoens has a reputation beyond repute mitchellsimoens has a reputation beyond repute mitchellsimoens has a reputation beyond repute mitchellsimoens has a reputation beyond repute mitchellsimoens has a reputation beyond repute mitchellsimoens has a reputation beyond repute mitchellsimoens has a reputation beyond repute mitchellsimoens has a reputation beyond repute

      0  

    Default

    It's something we are aware of and want to make better. I've learned to rename app.js before an upgrade and then manually merge my stuff into the new app.js
    Mitchell Simoens @SenchaMitch
    Sencha Inc, Senior Software Engineer
    ________________
    Check out my GitHub, lots of nice things for Ext JS 4 and Sencha Touch 2
    https://github.com/mitchellsimoens

    Think my support is good? Get more personalized support via a support subscription. https://www.sencha.com/store/

    Need more help with your app? Hire Sencha Services services@sencha.com

    Want to learn Sencha Touch 2? Check out Sencha Touch in Action that is in print!

    When posting code, please use BBCode's CODE tags.

  3. #3
    Sencha Premium Member
    Join Date
    Feb 2012
    Location
    Berne, Switzerland
    Posts
    721
    Vote Rating
    45
    ingo.hefti has a spectacular aura about ingo.hefti has a spectacular aura about ingo.hefti has a spectacular aura about

      0  

    Default

    Quote Originally Posted by mitchellsimoens View Post
    It's something we are aware of and want to make better.
    glad to hear that! thanks.
    Quote Originally Posted by mitchellsimoens View Post
    I've learned to rename app.js before an upgrade and then manually merge my stuff into the new app.js
    me too! and packager.json as well...

  4. #4
    Sencha User
    Join Date
    Jan 2013
    Posts
    1
    Vote Rating
    0
    xdongliang is on a distinguished road

      0  

    Default looking forward to this improvement

    We are looking forward to this improvement.hope you will accelerate the development process.

Thread Participants: 2