Re: [Freerdp-devel] Use of personal branches for development

[Otavio S. <ot...@os...>]

Hello,

On Sat, Jul 3, 2010 at 2:59 PM, Andreas Kotes <cou...@fl...> wrote:
> do we have sufficient enough modularity to allow manual merges without
> too much conflict?

For most of work yes; some refactoring and like, no.

> i.e. if I'd like to build a master branch version WITH all of the WIP
> stuff in it, would that be possible?

Sure; it would be possible to merge all them most of time.

-- 
Otavio Salvador                  O.S. Systems
E-mail: ot...@os...  http://www.ossystems.com.br
Mobile: +55 53 9981-7854         http://projetos.ossystems.com.br