SVN: forcing theirs-full

I have an svn local copy. I changed some files. Usually after svn checkout ... I got conflict me开发者_如何学运维ssage with options what to do with changed (in local copy) files. One of that option was theirs-full.

But this time after svn checkout I got G status on those files and no conflict message.

How can I get the server copy of those files?

Thanks.

Subversion only gives the conflict options (like theirs-full) if there is a conflict in the file: a change on the server that it can't merge into your local version. In your second case, Subversion was able to merge your local changes and the server changes without any problems, so it didn't need your input on what to do. If you want the server version, you can use svn revert to overwrite your local copy or svn cat to show the server copy or save it into a different file.