dhis2-devs team mailing list archive

[Hieu Dang Duy <hieu.hispvietnam@xxxxxxxxx>]

Hi there,

I removed also the projects as recommended and then do *bzr merge
lp:dhis2*at the working folder but meet a trouble in merging code from
i18n-uniqueness branch to dhis branch. PLS take a look.

What's wrong in my done?
*
D:\dhis2-global-bis\i18n-uniqueness\dhis-2>bzr merge lp:dhis2
Connected (version 2.0, client Twisted)
Authentication (publickey) successful!
Secsh channel 1 opened.*
*bzr: ERROR: Working tree "D:/dhis2-global-bis/i18n-uniqueness/" has
uncommitted changes.*


2010/4/22 Lars Helge Øverland <larshelge@xxxxxxxxx>

>
> Just remove the projects as described and do a bzr merge lp:dhis2. If you
> haven't done any changes in those projects it should work fine.
>
> Lars
>



-- 
Hieu.HISPVietnam
Good Health !
   <javascript: leoHighlightsIFrameClose();>