Friday, May 16, 2008 3:34 AM
this is driving me crazy.
I am trying to merge from one branch to another using the command line. When I try to merge .resx (or .config or .rdl) files, I get the following error message:
You cannot perform a merge on a binary file, or a file that stores latest version only.
The same file in both branches if UTF-8 with autodetect encoding on.
However it seems to work from ssexp.
I don't want to go through every single file and merge one by one via the UI - for a start it is difficult to even know which files need merging.
I have tried before applying the Dec 2007 VSS 2005 rollup update and after applying the update and rebooting. There doesn't seem to be any way to merge using IVSSDatabase/IVSSItem. I've had a brief look at MSSCCI but haven't tried anything with it.
Can someone please tell me how to merge such files other than by using the VSS 2005 UI?
Friday, May 16, 2008 3:36 AM
Just to clarify, I am trying to merge file by file using ss merge in a .bat file.
Monday, June 08, 2009 4:13 AMHi, I know this is a year old, but in case it is helpful to you, I've posted a solution on www.codeproject.com. Here's the link:Tom
Wednesday, June 10, 2009 7:47 AMThanks for the article, Tom.