Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
> From: Tony Hoyle [mailto:tmh at nodomain.org] > > For a binary file a merge is always a conflict. In practice this > means that if the version in the sandbox is different from the latest > version then you will conflict. > > There is no branchpoint/mergepoint logic involved with a binary file > as it's never needed. > Yes, I understand that any merge on a binary file is a conflict, but what I'm trying to show is that there are some points where a binary file does not need to merge because it has previously been merged (by the user, not by CVS). CVS can detect this by looking the mergepoints and so avoid the conflicts. Regards, Andy -- Andy Harrison - Platform Software Engineer Anite Telecoms Ltd. 127 Fleet Road, Fleet, Hampshire, GU51 3QN, UK "No matter how bad things seem... ...nothing could be worse than being used as a towel rail." - A.A. Milne Please note that my email domain has changed from @anitetelecoms.com to @anite.com Registered in England No. 1721900 Registered Office: 353 Buckingham Avenue, Slough, Berkshire SL1 4PF, United Kingdom Scanned for viruses by MessageLabs. The integrity and security of this message cannot be guaranteed. This email is intended for the named recipient only, and may contain confidential information and proprietary material. Any unauthorised use or disclosure is prohibited.