visual studio - Why does C# designer-generated code (like Form1.designer.cs) play havoc with Subversion? -

My workshop recently switched from Sources to Subversion, which has automatically freed us from the lock. This has made concurrent edits of the form, which is amazing but when many developers reduce their changes, then to resist the code file ( TheFormName.designer.cs names of all files created by the designer) It is very difficult. As far as I can tell, this is because the code generated by the designer is heavily regulated whenever the user modifies it, even if the actual change is actually small .

• How can I make these conflicts easy to solve?
• Is there a way for the designer to modify the lower code?
• How can you cope with the concurrent revision of the experienced C # team, a form?
designer I

CS files can be found online, they do not have a particularly complex structure.

Some parts of it are being restructured? I think this is the sequence of properties in most InitializeComponent () method?

If this is the case, then you can write a simple script that re-order those alphabets in alphabetical order (especially if you manually edit these files in any form anytime Do not), and use it as a subversion.

Um, okay ... Scratches The big red box at the bottom of that section says that you should not modify the transaction in hook scripts.

Edit:

But

Actually, the scrammer was commented on:

< P> Total hack, but in the worst case, before merge, I could sort both files, and could only merge a line-by-line detour ...

< P> Can not set external merge program to subversion? I am using, which can do so, so that you can automate that process.