Re: Conflict Resolve Issue 1:

On 04/10/2007, Anthony <tortoisesvn@gray-team.com> wrote:
> 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?

Yes, it's is normal and has nothing to do with TSVN or Subversion -
it's a KDiff3 feature that's enabled by default. To disable it go to
the menu "Settings", then "Directory Merge" tab, then "Backup files
(.orig)" checkbox. But I rather leave it enabled.

-- 
Milen A. Radev
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org