[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Handling binary conflicts

From: Andy Levy <andy.levy_at_gmail.com>
Date: 2006-05-26 16:45:30 CEST

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.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri May 26 16:46:47 2006

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.