Hello Phil, On Wed, Nov 18, 2009 at 6:42 PM, Phil Blundell <[email protected]> wrote: > On Wed, 2009-11-18 at 18:11 -0200, Otavio Salvador wrote: >> From my POV the best alternative is, before we start changing a lot of >> stuff in dev we do a merge of stable/2009 into dev to allow easy >> merging from outside "forks" made by users. > > I don't quite understand what you mean by merging stable/2009 into dev. > Isn't it the case that all the changesets in stable/2009 were > cherry-picked from .dev in the first place, and hence are already there? > > Can you give a bit more detail on what exactly you are proposing?
Please try it: git checkout -b merge-try origin/org.openembedded.dev git merge stable/2009 You'll notice how many conflicts it produces. -- Otavio Salvador O.S. Systems E-mail: [email protected] http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
