Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
Does anyone have any experience with this?
For instance, consider Subversion, Git, or Mercurial, and a typical Windows Forms form.
Whenever someone edits the form, for instance repositions a panel to have a different parent, sometimes the form designer code generator rearranges more code than just that panel.
Does anyone have any experience with how big a merge problem this is?
Yes, I tried to answer it here. Simply put, what we do is to have a “pre-merge” script in PlastiSCM (you could use it with your preferred SCM) to “sort” the resx prior to merge. This way we avoid weird issues.
Note: Delphi did a better job handling resources 15 years ago than the newest generation VStudio… 🙁