Side note: Ignore the BaseConfig.xcconfig hard coded MOZ_VERSION and MOZ_BUILD_ID right now off master as it’s currently confusing.
Aaron Train Sr. QE Engineer Mozilla Corporation https://quality.mozilla.org > On Dec 9, 2015, at 1:35 PM, Richard Newman <[email protected]> wrote: > > Hi Mahmoud, > > v1.x is the branch from which we're releasing v1.3 and v1.4. You'll see we > branch for each RC/TestFlight release: > > https://github.com/mozilla/firefox-ios/tree/v1.3b1305 > <https://github.com/mozilla/firefox-ios/tree/v1.3b1305> > > 1.3 and 1.4 will be short-term bugfix releases. We're currently working on > longer-term features in 'master' and uplifting smaller fixes to v1.x. > > As we cut new releases, those will be branched off master, so we'll have one > stabilization branch (e.g., v2.x) and one mainline development branch > (master). > > You very likely want to work on a branch off master, periodically rebasing as > necessary. > > On Tue, Dec 8, 2015 at 7:04 AM, Mahmoud Adam <[email protected] > <mailto:[email protected]>> wrote: > Hello, > > I am forking from Firefox-iOS <https://github.com/mozilla/firefox-ios> and > was wondering about the branching strategy. I am confused about which branch > to start from and which one to periodically merge with and when? > > I see that v1.0 is stable branch and already released, but the current > release app on the apple store has version is 1.2 however I couldn't find a > branch called v1.2 instead there is v1.x which always has new commits. > > So I would be grateful if you advised me on how to periodically keep my > repository in sync with the new updates on the Firefox-iOS. > > -- > Kind Regards, > Mahmoud Adam > > > _______________________________________________ > mobile-firefox-dev mailing list > [email protected] <mailto:[email protected]> > https://mail.mozilla.org/listinfo/mobile-firefox-dev > <https://mail.mozilla.org/listinfo/mobile-firefox-dev> > > > _______________________________________________ > mobile-firefox-dev mailing list > [email protected] > https://mail.mozilla.org/listinfo/mobile-firefox-dev
_______________________________________________ mobile-firefox-dev mailing list [email protected] https://mail.mozilla.org/listinfo/mobile-firefox-dev
