dhis2-devs team mailing list archive

[Bob Jolliffe <bobjolliffe@xxxxxxxxx>]

I am having something of a problem with 'bzr merge'.  I checkout from
trunk into say dhis2-trunk/ .

Then I try bzr merge ../dhis2-xml to merge my changes but I keep
getting conflicts along the lines of

Conflict adding files to dhis-2/dhis-services/dhis-service-xml.
Created directory.
Conflict because dhis-2/dhis-services/dhis-service-xml is not
versioned, but has versioned children.  Versioned directory.
Conflict adding file dhis-2/dhis-services/dhis-service-xml.  Moved
existing file to dhis-2/dhis-services/dhis-service-xml.moved.

Any idea how to resolve these?

Regards
Bob