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.
Small question which hopefully someone can help with, and I cannot seem to see anything in the documentation relating to this, but what are the rules when merging from a branch to the head (or in fact between any two branches) where there are binary objects? If I have my head branch and I add a binary file to HEAD (-kbx) and then create a branch, modify the file on the branch (along with some ascii files as well) and perform a merge, the Binary file will overwrite the revision in HEAD without giving any errors or conflicts (it does leave the original as a .# file). I then however cannot commit the file since I am not a valid editor of the file. I want to understand what the CVS rules are when merging between branches when there are binaries involved. Anyone have any ideas or pointers to any documentation about this, Cheers Trevor ###################################################################### Attention: This e-mail message is privileged and confidential. If you are not the intended recipient please delete the message and notify the sender. Any views or opinions presented are solely those of the author. ######################################################################