On Fri, May 25, 2018 at 7:49 AM Chih-Wei Huang <[email protected]> wrote:
> Thank you for the update. > > However, I always feel uneasy why the updated tag is not a fast-forward > commit of previous release. > Worse, usually there are explicitly conflicts between them. > > For example, in frameworks/av, merging > > android-8.1.0_r22 to > > android-8.1.0_r25 (or r29) > results in the conflicts: > These tags were from different branches, see https://source.android.com/setup/start/build-numbers for additional information. You should use tag for the build of the same branch that corresponds to the desired security level; if it's not possible (e.g. branch was switched for the device, etc.), it's usually easier to cherry-pick your local modifications over the latest tag. Cheers, -- -- You received this message because you are subscribed to the "Android Building" mailing list. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/android-building?hl=en --- You received this message because you are subscribed to the Google Groups "Android Building" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
