Conflict Resolve Issue 1:

The issue I have is that after resolving a conflict, the
.orig file is left in the directory. I use an external
program (Kdiff) for merges/conflict resolutions. After
getting a conflict (during an update) I double click to
resolve. After resolving, I save the file. I then go
back to the update window/dialog and right click and
choose “Mark as resolved”. Then I go to the project
folder and see the filename.orig left over. Why is this?
 Is it normal?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed Oct 3 23:49:16 2007