4 Nov
2016
4 Nov
'16
11:23 p.m.
Hi,
Manually delete the directories (not sure this is even actually needed) and do a "bzr resolve" ?
--
Mc
On 11/04/2016 11:25 PM, mathog wrote:
> Hi all,
>
> What should one do about this situation?
>
> bzr update
> <many messages omitted>
> Conflict: can't delete m4 because it is not empty. Not deleting.
> Conflict: can't delete src/libgdl because it is not empty. Not
> deleting.
> 2 conflicts encountered.
> Updated to revision 15207 of branch
> bzr+ssh://bazaar.launchpad.net/+branch/inkscape
>
> Thanks,
>
> David Mathog
> mathog@...1176...
> Manager, Sequence Analysis Facility, Biology Division, Caltech
>
> ------------------------------------------------------------------------------
> Developer Access Program for Intel Xeon Phi Processors
> Access to Intel Xeon Phi processor-based developer platforms.
> With one year of Intel Parallel Studio XE.
> Training and support from Colfax.
> Order your platform today. http://sdm.link/xeonphi
> _______________________________________________
> Inkscape-devel mailing list
> Inkscape-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/inkscape-devel
>