Branches, forks, and the app stores

[Cliff Ingham]

On 05/30/2013 06:01 AM, Rajul Bhatnagar wrote:
> Also is there any difference in the codebase of Georeporter on the play
> store and the code on Github cause I noticed that they have different
> package names.
>
>
> On 30 May 2013 11:05, Rajul Bhatnagar wrote:
>
>> I will test the SSL with Volley and OkHTTP.
>> Will we use the same Github repo for version control with a separate
>> branch??

You should work in your own fork of the Github repo.

The code that is in the master branch on Github is the actual code that's live in Google Play and iTunes App Store.  The package names should be the same.

There is, however, also a "Single City" version that I've also released.  In the Android version, the code is in a single-city branch.  In the iOS, it's a separate Github repo.  The single city version is exactly the same, except it has the server-choosing screens commented out.

Within your own fork, I think it's fine to leave the branching decisions up to you.  I can merge changes from your fork, back into the main repo.  When I do merge your changes, I'll be creating a branch for the merge.  Once I've finished the merge and tested it out, I can take my freshly-merged branch, and merge it back into the master of the main repo.

Because we're talking about a summer-long project with lots of new code, I'm not sure it makes sense to worry about creating a branch for each separate issue in the issue tracker.  But if the branches help you keep things straight, go for it.