1
从颠覆更新文件后,我尝试解决冲突的选项:他们的,我的或合并,但操作无效。我查看了SharpSvn网站和stackoverflow主题的文档,但没有解决方案成功。SharpSvn解决冲突不起作用
我的代码
SvnResolveArgs svnResolveArgs = new SvnResolveArgs();
svnResolveArgs.ThrowOnError = true;
SvnAccept accept = SvnAccept.Unspecified;
switch (frmResolve.IdResolve)
{
case 0:
accept = SvnAccept.Theirs;
break;
case 1:
accept = SvnAccept.Mine;
break;
case 2:
accept = SvnAccept.Merged;
break;
}
if (accept != SvnAccept.Unspecified)
{
client.Resolve(_caminhoGELocal, accept, svnResolveArgs);
HideInvoke(f);
this.ShowMsg(Mensagens.SucessoOperacao);
_isOcorreuConflito = false;
}
else
this.ShowMsg(Mensagens.OpcaoResolveNaoSelecionada);
解决执行后,我的文件保持与修改文件和标记像波纹管:
<<<<<<< .mine
<Style id="s_ylw-ccccccccc">
<IconStyle>
<scale>1.5</scale>
<Icon>
<href>http://maps.google.com/mapfiles/kml/shapes/water.png</href>
</Icon>
<hotSpot x="0.5" y="0" xunits="fraction" yunits="fraction"/>
</IconStyle>
</Style>
||||||| .r4477
=======
如何解决这个错误?
谢谢Bert Huijben。 –