Hey Richard, My question is, would there be an easier way to merge update from Fennec > and still be able to push to our own git? >
You should be able to setup the Mozilla repo as a new remote to your local git clone. This way you'll be able to pull in any changes that we make 'upstream', merge them into your local copy, then push them to your git server. Github has some good documentation for how users can set this up between forks [1] which might be of use. Second question, if we plan to release to the app store in the next 3 > months is it advisable to use this code base or should I be using a > different branch? > It depends on how many changes you've made to the existing project compared to new additions. It might be a pain to handle all of the conflicts since the Swift 3 migration included a ton of code changes [2]. Another thing to keep in mind is that the latest Xcode Beta removes support for Swift 2.3 so if you plan on using the latest Xcode for development there is a good chance that within the next 3 months you'll have to move to 3.0 anyways. If you do move to using our master/Swift 3.0 version of the app I would recommend trying to keep up to date with patches we land in the next few weeks as there may be fixes to regressions from the migration. The codebase so far seems relatively stable after the migration but it hasn't gone to a wide audience for testing yet. [1] https://help.github.com/articles/syncing-a-fork/ [2] https://github.com/mozilla-mobile/firefox-ios/pull/2419 On Thu, Feb 23, 2017 at 2:44 AM, Richard G. Reyes <richrd.re...@gmail.com> wrote: > Hello Guys, > > Good day. We are extending Fennec for our app, now I have downloaded a > version, 3 weeks ago which is using Swift 2.4. All my codes are committed > to our own git server. > > Now, I just downloaded a zip file from https://github.com/ > mozilla-mobile/firefox-ios. I know this is for Swift 3.0, so what I plan > to do is manually merge our files into it. > > My question is, would there be an easier way to merge update from Fennec > and still be able to push to our own git? > > Second question, if we plan to release to the app store in the next 3 > months is it advisable to use this code base or should I be using a > different branch? > > Thanks in advance. > > -Richard > > _______________________________________________ > mobile-firefox-dev mailing list > mobile-firefox-dev@mozilla.org > https://mail.mozilla.org/listinfo/mobile-firefox-dev > >
_______________________________________________ mobile-firefox-dev mailing list mobile-firefox-dev@mozilla.org https://mail.mozilla.org/listinfo/mobile-firefox-dev
