Re: Handling binary conflicts

Right-click on the conflict line for the binary file in question in the
progress box and choose "resolve using mine" or "resolve using theirs"
should work.

Andy Levy wrote:
> I have some images in my tree that I've merged, and SVN found a
> conflict in the merge. I know which version to use to resolve the
> conflict, but obviously can't "edit" it. Does TSVN haev a facility
> for resolving conflicts in binary files, or do I need to manually
> rename the merge-right.rX files and mark the conflict resolved?
>
> Running TSVN 1.3.3 build 6219 on XP Pro 32-bit.

-- 
Donald H Locker
PTM Electronics, Inc
734 426 9010
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org