{"action":"created","issue":{"url":"https://api.github.com/repos/aspnet/Tooling/issues/293","repository_url":"https://api.github.com/repos/aspnet/Tooling","labels_url":"https://api.github.com/repos/aspnet/Tooling/issues/293/labels{/name}","comments_url":"https://api.github.com/repos/aspnet/Tooling/issues/293/comments","events_url":"https://api.github.com/repos/aspnet/Tooling/issues/293/events","html_url":"https://github.com/aspnet/Tooling/issues/293","id":118151992,"number":293,"title":"Merge tool with .cshtml file crashes Visual Studio with RC1 tools","user":{"login":"jeffpapp","id":1260960,"avatar_url":"https://avatars.githubusercontent.com/u/1260960?v=3","gravatar_id":"","url":"https://api.github.com/users/jeffpapp","html_url":"https://github.com/jeffpapp","followers_url":"https://api.github.com/users/jeffpapp/followers","following_url":"https://api.github.com/users/jeffpapp/following{/other_user}","gists_url":"https://api.github.com/users/jeffpapp/gists{/gist_id}","starred_url":"https://api.github.com/users/jeffpapp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jeffpapp/subscriptions","organizations_url":"https://api.github.com/users/jeffpapp/orgs","repos_url":"https://api.github.com/users/jeffpapp/repos","events_url":"https://api.github.com/users/jeffpapp/events{/privacy}","received_events_url":"https://api.github.com/users/jeffpapp/received_events","type":"User","site_admin":false},"labels":[{"url":"https://api.github.com/repos/aspnet/Tooling/labels/TFS%20Tracked","name":"TFS Tracked","color":"009800"}],"state":"closed","locked":false,"assignee":{"login":"madskristensen","id":1258877,"avatar_url":"https://avatars.githubusercontent.com/u/1258877?v=3","gravatar_id":"","url":"https://api.github.com/users/madskristensen","html_url":"https://github.com/madskristensen","followers_url":"https://api.github.com/users/madskristensen/followers","following_url":"https://api.github.com/users/madskristensen/following{/other_user}","gists_url":"https://api.github.com/users/madskristensen/gists{/gist_id}","starred_url":"https://api.github.com/users/madskristensen/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/madskristensen/subscriptions","organizations_url":"https://api.github.com/users/madskristensen/orgs","repos_url":"https://api.github.com/users/madskristensen/repos","events_url":"https://api.github.com/users/madskristensen/events{/privacy}","received_events_url":"https://api.github.com/users/madskristensen/received_events","type":"User","site_admin":false},"milestone":null,"comments":41,"created_at":"2015-11-20T23:52:19Z","updated_at":"2016-03-08T13:36:54Z","closed_at":"2015-12-01T22:19:04Z","body":"If I use the merge tool in VS 2015 while trying to resolve conflicts from a Git merge it will fail on some .cshtml files.  This didn't seem to happen before installing the newer RC 1 tools this week.\r\n\r\nI'm seeing this error message in C:\\Users\\<user>\\AppData\\Roaming\\Microsoft\\VisualStudio\\14.0\\ActivityLog.xml\r\n\r\n```xml\r\n  <entry>\r\n    <record>562</record>\r\n    <time>2015/11/20 23:37:50.833</time>\r\n    <type>Error</type>\r\n    <source>Editor or Editor Extension</source>\r\n    <description>System.ArgumentNullException: Value cannot be null.&#x000D;&#x000A;Parameter name: key&#x000D;&#x000A;   at System.Collections.Generic.Dictionary`2.FindEntry(TKey key)&#x000D;&#x000A;   at Microsoft.VisualStudio.Html.Package.Extensions.ExtensionsManager.OnTextViewCreated(ITextView textView, ITextBuffer textBuffer)&#x000D;&#x000A;   at Microsoft.Web.Editor.Controller.TextViewConnectionListener.OnTextViewGotAggregateFocus(ITextView textView, ITextBuffer textBuffer)&#x000D;&#x000A;   at Microsoft.VisualStudio.Html.Package.Commands.Html.VsHtmlTextViewConnectionListener.OnTextViewGotAggregateFocus(ITextView textView, ITextBuffer textBuffer)&#x000D;&#x000A;   at Microsoft.Web.Editor.Controller.TextViewConnectionListener.&lt;&gt;c__DisplayClass24_0.&lt;OnTextViewConnected&gt;b__0(Object sender, EventArgs eventArgs)&#x000D;&#x000A;   at Microsoft.VisualStudio.Text.Utilities.GuardedOperations.RaiseEvent(Object sender, EventHandler eventHandlers)</description>\r\n  </entry>\r\n```\r\n\r\nHere is the info from About VS in case that is helpful\r\n\r\n```\r\nMicrosoft Visual Studio Professional 2015\r\nVersion 14.0.23107.0 D14REL\r\nMicrosoft .NET Framework\r\nVersion 4.6.01038\r\n\r\nInstalled Version: Professional\r\n\r\nVisual Basic 2015   00322-50050-03692-AA603\r\nMicrosoft Visual Basic 2015\r\n\r\nVisual C# 2015   00322-50050-03692-AA603\r\nMicrosoft Visual C# 2015\r\n\r\nVisual C++ 2015   00322-50050-03692-AA603\r\nMicrosoft Visual C++ 2015\r\n\r\nApplication Insights Tools for Visual Studio Package   1.0\r\nApplication Insights Tools for Visual Studio\r\n\r\nASP.NET and Web Tools 2015 (RC)   14.1.11116.0\r\nASP.NET and Web Tools 2015 (RC)\r\n\r\nASP.NET Web Frameworks and Tools 2013   5.2.30624.0\r\nFor additional information, visit http://www.asp.net/\r\n\r\nAzure App Service Tools v2.7.1   14.0.11112.0\r\nAzure App Service Tools v2.7.1\r\n\r\nCodeMaid   v0.8.1\r\nCodeMaid is an open source Visual Studio extension to cleanup, dig through and simplify our C#, C++, F#, VB, PHP, JSON, XAML, XML, ASP, HTML, CSS, LESS, SCSS, JavaScript and TypeScript coding.\r\n\r\nWritten by Steve Cadwallader, for more information visit http://www.codemaid.net/\r\n\r\nCommon Azure Tools   1.6\r\nProvides common services for use by Azure Mobile Services and Microsoft Azure Tools.\r\n\r\nGenerateUnitTest   1.0\r\nGenerates unit test code for methods in classes under test.\r\n\r\nGitHub.VisualStudio   1.0\r\nA Visual Studio Extension that brings the GitHub Flow into Visual Studio.\r\n\r\nMicrosoft Azure HDInsight HQL Service   2.0.2600.0\r\nLanguage service for Hive query\r\n\r\nMicrosoft Azure HDInsight Tools for Visual Studio   2.0.2600.0\r\nAn integrated development environment for HDInsight application development.\r\n\r\nMicrosoft Azure Mobile Services Tools   1.4\r\nMicrosoft Azure Mobile Services Tools\r\n\r\nMicrosoft Azure Tools   2.7\r\nMicrosoft Azure Tools for Microsoft Visual Studio 2015 - v2.7.30818.1601\r\n\r\nNuGet Package Manager   3.2.0\r\nNuGet Package Manager in Visual Studio. For more information about NuGet, visit http://docs.nuget.org/.\r\n\r\nPreEmptive Analytics Visualizer   1.2\r\nMicrosoft Visual Studio extension to visualize aggregated summaries from the PreEmptive Analytics product.\r\n\r\nSQL Server Data Tools   14.0.50730.0\r\nMicrosoft SQL Server Data Tools\r\n\r\nWakaTime   1.0\r\n\r\n\r\nWeb Analyzer   1.4.48\r\nProvides static analysis directly in Visual Studio for JavaScript, TypeScript, JSX, CSS and more\r\n\r\nWeb Essentials 2015   0.5.197\r\nAdds many useful features to Visual Studio for web developers.\r\n\r\n```"},"comment":{"url":"https://api.github.com/repos/aspnet/Tooling/issues/comments/193787696","html_url":"https://github.com/aspnet/Tooling/issues/293#issuecomment-193787696","issue_url":"https://api.github.com/repos/aspnet/Tooling/issues/293","id":193787696,"user":{"login":"caglardursun","id":158498,"avatar_url":"https://avatars.githubusercontent.com/u/158498?v=3","gravatar_id":"","url":"https://api.github.com/users/caglardursun","html_url":"https://github.com/caglardursun","followers_url":"https://api.github.com/users/caglardursun/followers","following_url":"https://api.github.com/users/caglardursun/following{/other_user}","gists_url":"https://api.github.com/users/caglardursun/gists{/gist_id}","starred_url":"https://api.github.com/users/caglardursun/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/caglardursun/subscriptions","organizations_url":"https://api.github.com/users/caglardursun/orgs","repos_url":"https://api.github.com/users/caglardursun/repos","events_url":"https://api.github.com/users/caglardursun/events{/privacy}","received_events_url":"https://api.github.com/users/caglardursun/received_events","type":"User","site_admin":false},"created_at":"2016-03-08T13:36:54Z","updated_at":"2016-03-08T13:36:54Z","body":"I've the same issue Visual Studio 14.0.2472"}}