Hello Thomas, > We have several developers in our team and all make changes to the UI > (WinForms) and the code. > So we always get caught in conflicts when two parties made changes to the > project. > > Resolving code conflicts is easy, but resolving conflicts in designer files > is hardly possible. > > What are your practices to avoid or resolve this? > What are we doing wrong? Shall we restrict UI changes?
Could you please describe the case when you get a merge conflict? Visual Studio designer generates C# or VB.Net code so "designer files" as you refer to them are still regular textual source code files. Approach to solving merge conflicts is the same as with other source code files; there is no special pattern for this, at least I'm not aware of it. Thank you. -- With best regards, Pavel Lyalyakin VisualSVN Team -- You received this message because you are subscribed to the Google Groups "VisualSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to visualsvn+unsubscr...@googlegroups.com. To post to this group, send email to visualsvn@googlegroups.com. Visit this group at http://groups.google.com/group/visualsvn?hl=en. For more options, visit https://groups.google.com/groups/opt_out.
