VS2012加载项目失败解决办法

    <Content Include="views\Web.config" />
    <Content Include="views\_ViewStart.cshtml" />
    <Content Include="views\ucenter\_menu.cshtml" />
    <Content Include="themes\Web.config" />
    <Content Include="themes\default\views\_banner.cshtml" />
    <Content Include="views\error\development.cshtml" />
    <Content Include="views\vote\index.cshtml" />
    <Content Include="views\home\endemic.cshtml" />
    <Content Include="views\home\tour.cshtml" />
<<<<<<< .mine
    <Content Include="views\signup\后index.cshtml" />
    <Content Include="views\Test\Upload.cshtml" />
    <Content Include="views\Test\show.cshtml" />
    <Content Include="views\signup\show.cshtml" />
    <Content Include="views\signup\upload.cshtml" />
    <Content Include="views\signup\index.cshtml" />
    <Content Include="views\Test\测试index.cshtml" />
    <Content Include="views\signup\UploadFile.cshtml" />
||||||| .r19
=======
    <Content Include="views\partner\index.cshtml" />
>>>>>>> .r20
  </ItemGroup>
  <ItemGroup>
    <Folder Include="App_Data\txtlogs\" />
    <Folder Include="plugins\bin\" />
    <Folder Include="upload\adv\" />

    <Folder Include="upload\brand\" />

配置文件里面出错，所以不能正确加载。

这个错误是由于从SVN上更新文件下来到本机后，分支文件与本机文件有差异，而SVN添加了标识所致。

解决办法，根据提示，去掉提示即可。

即：

    <Content Include="views\Web.config" />
    <Content Include="views\_ViewStart.cshtml" />
    <Content Include="views\ucenter\_menu.cshtml" />
    <Content Include="themes\Web.config" />
    <Content Include="themes\default\views\_banner.cshtml" />
    <Content Include="views\error\development.cshtml" />
    <Content Include="views\vote\index.cshtml" />
    <Content Include="views\home\endemic.cshtml" />
    <Content Include="views\home\tour.cshtml" />
    <Content Include="views\signup\后index.cshtml" />
    <Content Include="views\Test\Upload.cshtml" />
    <Content Include="views\Test\show.cshtml" />
    <Content Include="views\signup\show.cshtml" />
    <Content Include="views\signup\upload.cshtml" />
    <Content Include="views\signup\index.cshtml" />
    <Content Include="views\Test\测试index.cshtml" />
    <Content Include="views\signup\UploadFile.cshtml" />
    <Content Include="views\partner\index.cshtml" />
  </ItemGroup>
  <ItemGroup>
    <Folder Include="App_Data\txtlogs\" />
    <Folder Include="plugins\bin\" />
    <Folder Include="upload\adv\" />

    <Folder Include="upload\brand\" />