Hi Michael,
On Tue, Jul 15, 2014 at 4:41 PM, Michael Barton <[email protected]> wrote: > I’m updating my source tree in order to make new Mac binaries. I get the > following error: > > Skipped 'locale/po/grassnviz_ro.po' -- Node remains in conflict > At revision 61256. > > I’ve updated twice with the same problem. The 2nd time I deleted and > restored all source files. Same thing. So I am guessing it is at the server > end. > I am not an svn expert, but I think it could still be a problem with svn at your side. Have you tried 'svn resolved filename' as suggested here? http://stackoverflow.com/questions/2406469/svn-remains-in-conflict Anna > Michael > ______________________________ > C. Michael Barton > Director, Center for Social Dynamics & Complexity > Professor of Anthropology, School of Human Evolution & Social Change > Head, Graduate Faculty in Complex Adaptive Systems Science > Arizona State University > Tempe, AZ 85287-2402 > USA > > voice: 480-965-6262 (SHESC), 480-965-8130/727-9746 (CSDC) > fax: 480-965-7671(SHESC), 480-727-0709 (CSDC) > www: http://csdc.asu.edu, http://shesc.asu.edu > http://www.public.asu.edu/~cmbarton > > > _______________________________________________ > grass-dev mailing list > [email protected] > http://lists.osgeo.org/mailman/listinfo/grass-dev >
_______________________________________________ grass-dev mailing list [email protected] http://lists.osgeo.org/mailman/listinfo/grass-dev
