Is there an easier way to merge Windows Forms .Designer files, *.resx file?

Question

Dear All,

Is there an easier way to merge Windows Forms .Designer files?

The VS use code generation to help create control layout for user, but if there is any little change done by the member of the project, there is a nightmare to merge the code.

Because the code generation moves the code from area A to area B, and it is very difficult to merge to code when there is a change.

Any suggestions?

Thanks and best regards,

E-John

Answer 1

Hi E-John，
Based on your description, I have a suggestion you can refer to.
Taking the resx file as an example, you can sort the elements in the .resx file by name attribute.
Since both files are sorted in a deterministic manner, the merge utility can accurately determine which elements are new and changed without introducing error conflicts due to environmental differences in the location of the elements.
Some people offered some other ideas about the merger of these two files and hope it could be helpful to you.
[Is there an easier way to merge Windows Forms .Designer files?]
[Best Tool/Method to Keep .Resx and Designer.cs Files in a Consistent Order]
Best Regards,
Daniel Zhang

---

MSDN Community Support
Please remember to click "Mark as Answer" the responses that resolved your issue, and to click "Unmark as Answer" if not. This can be beneficial to other community members reading this thread. If you have any compliments or complaints to MSDN Support, feel free to contact [e-mail].

Answer 2

If two teams are working on separate areas of the form, can you just move the areas into separate user controls?

This also makes unit testing easier. 

---

---

Visual C++ MVP

Answer 3

Hi E-John,
Has your problem been solved? If it is resolved, we suggest that you mark it as the answer. So it can help other people who have the same problem find a solution quickly. If not solved, what problem did you encounter?
Best Regards,
Daniel Zhang

---

MSDN Community Support
Please remember to click "Mark as Answer" the responses that resolved your issue, and to click "Unmark as Answer" if not. This can be beneficial to other community members reading this thread. If you have any compliments or complaints to MSDN Support, feel free to contact [e-mail].