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

Re: Binary Merge ?

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2004-10-13 02:16:02 CEST

Scott Palmer wrote:
> The recent discussion about locking got me thinking. What happens when
> subversion sees that a binary file needs to be merged? Is it
> automatically marked as conflicted? (That seems like a reasonable thing
> to do to me.)

Yes, it is automatically marked as conflicted.

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Oct 13 02:16:20 2004

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

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