DVCS（或者更确切地说，任何非排他性结帐 VCS）和 Windows 窗体？合并问题？
有人有这方面的经验吗？
例如，考虑 Subversion、Git 或 Mercurial 以及典型的 Windows 窗体表单。
每当有人编辑表单时，例如重新定位面板以使其具有不同的父级，有时表单设计器代码生成器会重新排列比该面板更多的代码。
有谁有过这有多大的合并问题的经验吗？
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?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（2）
是的，我试图在这里回答。简而言之，我们所做的就是在 PlastiSCM 中有一个“预合并”脚本（您可以将其与您首选的 SCM）在合并之前对 resx 进行“排序”。这样我们就可以避免奇怪的问题。
注意：15 年前，Delphi 在处理资源方面比最新一代的 VStudio 做得更好......:(
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... :(
诚然，我只是一个单人团队（使用 git），但我认为我从未见过可怕的问题。也许有时会进行一些手动合并。
老实说，我真正遇到的问题是 .sln 文件（请参阅这个问题）。您有机会在视觉上理解和合并 Designer.cs 文件。解决方案文件完全是一场灾难...我已经采取了只进行合并的一侧，然后手动更正的方法。
运行一些测试怎么样？
Admittedly, I'm just a one-man team (with git), but I don't think I've ever seen horrible problems. Maybe some manual merges from time to time.
To be honest, where I've really had problems is with the .sln files (see this question). A designer.cs file you have a chance of understanding and merging visually. Solution files are a total disaster... I've taken to just taking one side of a merge and then correcting manually afterwards..
How about running a few tests?