Merge tools in "Resolve conflicts" not shown

Disabling the "Optimize rendering for screens with different pixel densities"( "Options -> Environment -> General -> Optimize rendering for screens with different pixel densities (requires restart)")
and restart visual studio

 Or

 Inside the "Developer Command Prompt for VS2019", type the command

 tf resolve

 This will open (from what it looks like) the same window as the one within VS2019, without styling, but the Merge buttons will are present and usable.

Comments

Post a Comment

Popular posts from this blog

JavaScript ajax request

// Ajax Post & Get Methods var ajax = {     post: function (method, data, success, error) {         $.ajax({             url: GlobalValues.WebApiUrl + method,             type: "POST",             cache: false,             contentType: 'application/json; charset=utf-8',             transformRequest: function (obj) {                 var str = [];                 for (var p in obj)                     str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));                 return str.join("&");             },             headers: {      ...
Read more

Javascript Error : No 'Access-Control-Allow-Origin' header is present on the requested resource

Solution  - Add below code in Global.asax.cs file in API Project         protected void Application_BeginRequest(object sender, EventArgs e)         {             HttpContext.Current.Response.AddHeader("Access-Control-Allow-Origin", "*");             if (HttpContext.Current.Request.HttpMethod == "OPTIONS")             {                 HttpContext.Current.Response.AddHeader("Cache-Control", "no-cache");                 HttpContext.Current.Response.AddHeader("Access-Control-Allow-Methods", "GET, POST");                 HttpContext.Current.Response.AddHeader("Access-Control-Allow-Headers", "Content-Type, Accept");                 HttpContext.Current.Response.AddHeader("Ac...
Read more