No need to check out trunk... Just do bzr merge lp:dhis2
On Thu, Feb 18, 2010 at 1:50 PM, Bob Jolliffe <[email protected]> wrote: > 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 : [email protected] > Unsubscribe : https://launchpad.net/~dhis2-devs > More help : https://help.launchpad.net/ListHelp >
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
