Merging .resx files

Hi,

I searched a bit, but couldn't find a solution for a problem I'm experiencing with .resx files and branch merges.

.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 two times.

Is there any way to work around this problem?

-- 
Best regards,
Shevek
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org