[oe] [RFC] Merging of stable/2009 into dev

[Otavio Salvador]

Hello,

On Thu, Nov 19, 2009 at 11:56 AM, Richard Purdie <rpurdie at rpsys.net> 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: otavio at ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854         http://projetos.ossystems.com.br