Hi, Can somebody explain how you manage the seandroid brances? Obviously seandroid tracks aosp/master and I can see that the aosp/master branch is regularly merged into seandroid. However, it is not immediately obvious how you maintain the stable branches that follow the release tags.
Initially I though you rebased (cherry-picked) your work from the seandroid branch onto the relevent release tag. However, I now see that it is not that because there are commits in the seandroid branch that do not appear in the release branches. I have looked at the stable branches and there are some common commits, but again they are not identical. My problem is that I am working on a project that follows the seandroid branch for development but now I want to make a stable release based on the release branch. Do you have any scripts to assist in the merges? Thanks, Owain
_______________________________________________ Seandroid-list mailing list [email protected] To unsubscribe, send email to [email protected]. To get help, send an email containing "help" to [email protected].
