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 _______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
