SharpSvn解決衝突不起作用

從顛覆更新文件後，我嘗試解決衝突的選項：他們的，我的或合併，但操作無效。我查看了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 
=======

如何解決這個錯誤？

來源

2017-07-28 Renan Barbosa