<div dir="ltr">Hi Michael,<br><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Jul 15, 2014 at 4:41 PM, Michael Barton <span dir="ltr"><<a href="mailto:Michael.Barton@asu.edu" target="_blank">Michael.Barton@asu.edu</a>></span> wrote:<br>

<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">



<div style="word-wrap:break-word">
I’m updating my source tree in order to make new Mac binaries. I get the following error:
<div><br>
</div>
<div>Skipped 'locale/po/grassnviz_ro.po' -- Node remains in conflict<br>
At revision 61256.</div>
<div><br>
</div>
<div>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.</div></div></blockquote><div><br></div><div>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?</div>

<div><a href="http://stackoverflow.com/questions/2406469/svn-remains-in-conflict">http://stackoverflow.com/questions/2406469/svn-remains-in-conflict</a><br></div><div><br></div><div>Anna</div><div><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">

<div style="word-wrap:break-word">
<div><br>
</div>
<div>Michael</div>
<div>
<div>
<div style="color:rgb(0,0,0);letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;word-wrap:break-word">
<div style="text-align:-webkit-auto;text-indent:0px;word-wrap:break-word">
<span style="border-collapse:separate;border-spacing:0px">
<div style="word-wrap:break-word">
<span style="border-collapse:separate;text-indent:0px;border-spacing:0px">
<div style="word-wrap:break-word">
<span style="border-collapse:separate;text-indent:0px;border-spacing:0px">
<div style="word-wrap:break-word">
<span style="border-collapse:separate;text-indent:0px;border-spacing:0px">
<div style="word-wrap:break-word">
<span style="border-collapse:separate;text-indent:0px;border-spacing:0px">
<div style="word-wrap:break-word">
<span style="border-collapse:separate;text-indent:0px;border-spacing:0px">
<div style="word-wrap:break-word">
<span style="border-collapse:separate;text-indent:0px;border-spacing:0px">
<div style="word-wrap:break-word">
<span style="border-collapse:separate;text-indent:0px;border-spacing:0px">
<div style="word-wrap:break-word">
<span style="border-collapse:separate;text-indent:0px;border-spacing:0px">
<div style="word-wrap:break-word">
<span style="border-collapse:separate;text-indent:0px;border-spacing:0px">
<div style="word-wrap:break-word">
<div style="color:rgb(0,0,0);font-family:'Lucida Grande';font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-transform:none;white-space:normal;word-spacing:0px">


<font face="Helvetica" size="3"><span style="font-size:12px">______________________________</span></font></div>
<div style="color:rgb(0,0,0);font-family:'Lucida Grande';font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-transform:none;white-space:normal;word-spacing:0px">


<font face="Helvetica" size="3"><span style="font-size:12px">C. Michael Barton </span></font></div>
<div style="color:rgb(0,0,0);font-family:'Lucida Grande';font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-transform:none;white-space:normal;word-spacing:0px">


<font face="Helvetica" size="3"><span style="font-size:12px">Director, Center for Social Dynamics & Complexity</span></font></div>
<div style="color:rgb(0,0,0);font-family:'Lucida Grande';font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-transform:none;white-space:normal;word-spacing:0px">


<font face="Helvetica" size="3"><span style="font-size:12px">Professor of Anthropology, School of Human Evolution & Social Change</span></font></div>
<div style="color:rgb(0,0,0);font-family:'Lucida Grande';font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-transform:none;white-space:normal;word-spacing:0px">


<font face="Helvetica" size="3"><span style="font-size:12px">Head, Graduate Faculty in Complex Adaptive Systems Science</span></font></div>
<div style="color:rgb(0,0,0);font-family:'Lucida Grande';font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-transform:none;white-space:normal;word-spacing:0px">


<span style="font-size:12px;font-family:Helvetica">Arizona State University</span></div>
<div style="color:rgb(0,0,0);font-family:'Lucida Grande';font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-transform:none;white-space:normal;word-spacing:0px">


<font face="Helvetica" size="3"><span style="font-size:12px">Tempe, AZ  85287-2402</span></font></div>
<div style="color:rgb(0,0,0);font-family:'Lucida Grande';font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-transform:none;white-space:normal;word-spacing:0px">


<font face="Helvetica" size="3"><span style="font-size:12px">USA</span></font></div>
<div style="color:rgb(0,0,0);font-family:'Lucida Grande';font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-transform:none;white-space:normal;word-spacing:0px">


<font face="Helvetica" size="3"><span style="font-size:12px"><br>
</span></font></div>
<div style="color:rgb(0,0,0);font-family:Helvetica;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-transform:none;white-space:normal;word-spacing:0px">
<font face="Helvetica" size="3" style="color:rgb(0,0,0);font-family:'Lucida Grande';font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-transform:none;white-space:normal;word-spacing:0px"><span style="font-size:12px">voice:<span> </span><span style="white-space:pre-wrap">
</span><a href="tel:480-965-6262" value="+14809656262" target="_blank">480-965-6262</a> (SHESC), <a href="tel:480-965-8130" value="+14809658130" target="_blank">480-965-8130</a>/</span></font><span style="font-size:12px">727-9746</span><span style="color:rgb(0,0,0);font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-transform:none;white-space:normal;word-spacing:0px"> (CSDC)</span></div>


<div style="color:rgb(0,0,0);font-family:'Lucida Grande';font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-transform:none;white-space:normal;word-spacing:0px">


<font face="Helvetica" size="3"><span style="font-size:12px">fax:          <a href="tel:480-965-7671" value="+14809657671" target="_blank">480-965-7671</a>(SHESC), <a href="tel:480-727-0709" value="+14807270709" target="_blank">480-727-0709</a> (CSDC)</span></font></div>


<div style="color:rgb(0,0,0);font-family:'Lucida Grande';font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-transform:none;white-space:normal;word-spacing:0px">


<font face="Helvetica" size="3"><span style="font-size:12px">www: <span style="white-space:pre-wrap">
</span><a href="http://csdc.asu.edu" target="_blank">http://csdc.asu.edu</a>, <a href="http://shesc.asu.edu" target="_blank">
http://shesc.asu.edu</a></span></font></div>
<div style="color:rgb(0,0,0);font-family:'Lucida Grande';font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-transform:none;white-space:normal;word-spacing:0px">


<font face="Helvetica" size="3"><span style="font-size:12px"><span style="white-space:pre-wrap"></span><a href="http://www.public.asu.edu/~cmbarton" target="_blank">http://www.public.asu.edu/~cmbarton</a></span></font></div>


</div>
</span></div>
</span></div>
</span></div>
</span></div>
</span></div>
</span></div>
</span></div>
</span></div>
</span></div>
</span></div>
</div>
</div>
<br>
</div>
</div>

<br>_______________________________________________<br>
grass-dev mailing list<br>
<a href="mailto:grass-dev@lists.osgeo.org">grass-dev@lists.osgeo.org</a><br>
<a href="http://lists.osgeo.org/mailman/listinfo/grass-dev" target="_blank">http://lists.osgeo.org/mailman/listinfo/grass-dev</a><br></blockquote></div><br></div></div>