Hello, On Thu, Nov 19, 2009 at 11:56 AM, Richard Purdie <[email protected]> wrote: > I think you actually want to do something like: > > git-merge --strategy=ours > > which should leave OE.dev unchanged. > > Does that actually help though?
No since it would lose any specific commit done for local development. -- 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
