On 05/03/2012 08:10 PM, John Stultz wrote:
On 05/03/2012 07:15 AM, Alexander Sack wrote:
On Thu, May 3, 2012 at 4:00 PM, Andrey Konovalov andrey.konovalov@linaro.org wrote:
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.
Done. The linaro-android-3.4 topic is back into the linux-linaro-core-tracking again.
Is the resolution simple enough?
Yes, 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.
Yes.
So Andrey mailed me that there was a conflict between Linus' v3.4-rc5 and the Android tree, but when I went to updated the tree sort it out, v.3.4-rc5 merged in without any issues. I suspect the collision is with something else in the linaro tree, but haven't yet gotten any feedback as to what that might be.
I wasn't exact enough. In fact the linux-linaro-core-tracking is mainline tip based, and the conflicting commits turned out to be post-v3.4-rc5. That's why the confusion.
Thanks, Andrey