Question

I’m using TortoiseSVN. Recently there is a file in conflicted state. I right click it, choose ‘Edit conflict’, then choose ‘Delete local file’.

I thought after deleting the local file, I could update to get the file from SVN server. But the fact is that TortoiseSVN doesn’t let me get the file on server down to my local computer.

TortoiseSVN just shows that there are no changes.

I need the latest version of that file from server!!!

Answer 1

If you want to get the version of the server, the easiest way is to

1. revert your local copy (if there are any changes in that directory or below, you will loose these, but if that conflict is the only problem, it helps. To do that, do the following:
   • Select Revert... from the menu
   • In the opening dialog, accept that the file is reverted.
2. You now have a local copy without changes, so there should be no conflict there.
3. Now update that file to the current state of the repository.

If that does not work for the file itself, try to to if for the directory where the file lays in. Normally, it should be possible for this directory (with the conflicted state) to be reverted …

I hope this order of actions works under any circumstances.