Re: Merging .resx files

Our solution was to treat the file as binary by setting auto-props on *.xml
to be a binary mime-type.

-steve

On 2/6/07 10:18 AM, "Greg Thomas" <thomasgd@omc.bt.co.uk> wrote:

> On Tue, 06 Feb 2007 16:01:33 +0100, shevek@gmx.at wrote:
>
>> .resx files are xml-files that stores resource information for VisualStudio
>> projects. Unfortunately changes to this file are changing the sequence of the
>> xml tags. So if I want to merge two branches I get a .resx file that contains
>> the same information tw
>> o times.
>>
>> Is there any way to work around this problem?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Feb 6 16:41:52 2007