On Thu, May 3, 2012 at 4:00 PM, Andrey Konovalov <andrey.konova...@linaro.org> wrote: > On 05/03/2012 04:28 AM, Andy Green wrote: >> >> On 04/25/2012 03:43 AM, Somebody in the thread at some point said: >> >> Hi - >> >>> The plan is to rebase this tree on the >>> current mainline tip daily. >> >> >> Now we're basing on it, our tracking progress depends on these "daily" >> rebases, but it's stuck since Friday. So we're missing -rc5 for 3 days. > > > Sorry for the delay. > I've updated the linux-linaro-core-tracking, but it currently misses the > linaro-android-3.4 topic. Will put the linaro-android-3.4 topic back after > resolving the merge conflicts; guess later today.
Is the resolution simple enough? Otherwise, feels that the better scalable approach is that the topic owner (e.g. John Stultz for the time being) gets notified and asked to fix the merge conflict on his side. Your daily merge scripts would then pick it up automatically as soon as the merge conflict is resolved. Sounds right? -- Alexander Sack Technical Director, Linaro Platform Teams http://www.linaro.org | Open source software for ARM SoCs http://twitter.com/#!/linaroorg - http://www.linaro.org/linaro-blog _______________________________________________ linaro-dev mailing list linaro-dev@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-dev
