Search code examples
svnconflict

svn 1.8 conflict : local file delete, incoming file edit upon update

I deleted locally a file to have the server's version. When I try svn up I get the error Tree conflict on file : local file delete, incoming file edit upon update.

The problem is that in the options of conflict's resolution I don't have tc (theirs conflict), I have only mc (mine conflict)

I have tried svn resolved mentioned in this discussion SVN remains in conflict? but It didn't work

Is there any help ?

Solution

  • Ok here is how I solved the problem. I don't know if this is the short way but it worked:

    delete the file in the server. re-add it + commit.