在分支合并期间，XML文件不在解决方案之列. [英] XML files left out of solution during branch merge.

问题描述

我有一个用于创建示例XML模板的Web服务工具的​​解决方案.我们最近将解决方案合并到另一个分支中.打开解决方案时，所有XML模板文件都被排除在解决方案之外，但是它们在源代码管理中显示为在那儿.应用程序的菜单是根据每个XML文件的名称动态创建的.即使在将XML文件添加到解决方案之后，仍不会创建菜单.在我们合并分支机构之前，它可以完美地工作.是否有人知道会导致此/如何将XML文件包含到解决方案中的原因?

解决方案

在Visual Studio解决方案资源管理器中，单击显示显示所有文件"的图标.然后，您应该看到带有通用白框图标的所有xml文件.右键单击它们，然后选择包含在项目中.

根据定义，分支合并在所有情况下均无法正常工作.通常，所有合并都需要手动解决.您是Revision Control软件的出卖者，还是有人蒙着眼睛接受了有争议的合并.合并目录的内容还不够.您的项目文件也是源代码，并且在此文件中引用了所有项目节点.自动合并可能会轻易破坏项目的一致性.只需在两个分支上查看以前的项目版本，然后确定合并版本中需要什么即可.分支机构在原则上可能会相互矛盾，因此需要一些有意识的决策.希望您可以在合并后还原项目.

—SA

原来，我需要将构建操作更改为嵌入式资源"，谢谢您的建议.

I have a solution for a web service harness used to create sample XML templates. We recently merged the solution into another branch. All the of the XML template files are left out of the solution when it''s opened, however they appear in source control as being there. The menus of the application are created dynamically based on the name of each XML file. Even with the XML files added to the solution after, the menus are still not created. Before we merged branches it worked flawlessly. Does anyone have any idea what would cause this / how to include XML files into the solution?

解决方案

In Visual Studio Solution Explorer click the icon that reads Show All Files. You should then see all the xml files with a generic white box icon. Right-click them and choose include in project.

Branch merge cannot work correctly in all cases, by definition. In general case, all merges need manual resolution. Either you Revision Control software betrayed you, or someone accepted the controversial merge in a blindfolded manner. Merging the contents of directories is not enough. You project file is a source code, too, and all the project nodes are referenced in this file. Automatic merging could break project consistency easily. Just review the previous project versions on both branches and decide what do you want in a merged version. The branches could contradict to each other in principle, so some conscious decision is required. I hope you can restore the project after the merge.

—SA

Turns out I needed to change the build action to "Embedded Resources", thanks for the suggestions.

这篇关于在分支合并期间，XML文件不在解决方案之列.的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！