Op 28 jun 2011, om 17:33 heeft Mark Hatle het volgende geschreven: > On 6/28/11 10:21 AM, Cui, Dexuan wrote: >> Koen Kooi wrote: >>> Op 28 jun 2011, om 16:52 heeft Cui, Dexuan het volgende geschreven: >>> >>>> Hi, thank you very much for the suggestions! >>>> I worked out a vesion 2 patch that combines 2 and 3: >>>> http://git.pokylinux.org/cgit/cgit.cgi/poky-contrib/commit/?h=dcui/banner_v2&id=2c2d9d7c0e942b6748bc8bd7d5980113bae9a836 >>> >>> Could you in the future please base them on oe-core instead of poky? >>> I just did 'git merge 2c2d9d7c0e942b6748bc8bd7d5980113bae9a836' and >>> git blew up. >> Sorry... but to basing them on oe-core, do I need the permission to push my >> commits to my own branch in >> git://git.openembedded.org/openembedded-core-contrib? I suppose so and I >> should put my public key somewhere into the server? > > You can push oe-core (based) changes to the poky-contrib tree. Many of us do > this regularly. > > I base my changes usually on oe-core, unless they contain poky specific code.. > I push both types to the same poky-contrib repository (in different branches > of > course). > > (I also always avoid "merge", and always use cherry-pick when pulling code > from > someone else's branches into my own..)
I tend to do that as well, but I was paying attention to the yocto phone call instead of the console :) _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
