What's the branch should a pull request target to?

[PeterDaveHello]

Hi @y-polek,

I saw the current default branch is release/0.9.11.4, which is diverged with the previous default branch(if I didn't recall it wrong, develop) for a while, looks like there are about 34 commits that the release/0.9.11.4 has but the develop branch doesn't, also, almost 84 commits that develop has but release/0.9.11.4 doesn't, the similiar situation is also on the master branch.

I'd like to help improve the translation of Traditional Chinese here, but don't know which branch I should target to right now, looks like recently merged pull requests are not delivered on the release branch, do you have any suggestion what should I do here? Do you have any plan to merge the release branch with develop or master branch?

Thanks a lot!

[y-polek]

Hi!

Please use release/0.9.11.4 branch for pull requests. This branch was used to build version 0.9.11.4 which is in Google Play.

develop and master contain changes which were not included in the release branch and should be dropped. I'll clean up this mess with branches and main development will move back into develop, but for now please use release/0.9.11.4.

[PeterDaveHello]

Thanks, just wondering, would the code in develop & master be merged into the release branch? Old pull requests use develop branch, and as v0.9.11.4 was released already, wouldn't sending pull requests to it a little bit confusing? (From my limited experience, more projects use develop, master, or release/v*(but not so specific) as default branch)

[y-polek]

@PeterDaveHello you are right. Latest commits in develop and master will not be merged into mainstream, they will be dropped.

I just changed develop and master to point to latest commit which was released as version 0.9.11.4. So, right now branches develop, master, release/0.9.11.4 and tag 0.9.11.4 point to the same commit. Also, I made develop a default branch for GitHub repo. Please use develop branch for pull requests.

In case if someone needs it, old develop and master branches are available as old_develop and old_master.

If you see any pull requests or commits which was not merged into new develop branch (not available in 0.9.11.4 version) please let me know and I'll integrate them manually into new develop (or create new pull request).

[PeterDaveHello]

Thanks, @y-polek, it's making more sense!

My #80 looks missing in the new develop, not sure the others, with all due respect, is there any reason to drop them? As 80+ commits are not very few, so I'm curious about that 😁

[y-polek]

@PeterDaveHello not all commits should be dropped, only my changes into networking code (unsuccessful attempt to migrate from Robospice to Retrofit).

I tried to merge all commits with bug fixes and improvements into 0.9.11.4 release branch but, apparently, missed some of them.

I'll merge #80 pull request into new develop branch again.