Skip to main content
Microsoft
Visual Studio
Visual Studio
  • Home
    • Guidelines
    • Problems
    • Suggestions
  • Downloads
    • Visual Studio IDE
    • Visual Studio Code
    • Azure DevOps
    • Team Foundation Server
    • Accounts and Subscriptions
  • Subscriber Access
      • Microsoft 365
      • Azure
      • Office 365
      • Dynamics 365
      • Power Platform
      • Windows 10
      • Windows Server
      • Enterprise Mobility + Security
      • Power BI
      • Teams
      • Visual Studio
      • Microsoft Advertising
      • AI
      • Internet of Things
      • Azure Cognitive Services
      • Quantum
      • Microsoft HoloLens
      • Mixed Reality
      • Docs
      • Developer Center
      • Windows Dev Center
      • Windows IT Pro Center
      • FastTrack
      • Power Platform
      • Partner Network
      • Solution Providers
      • Partner Center
      • Cloud Hosting
      • Education
      • Financial services
      • Government
      • Health
      • Manufacturing & resources
      • Retail
      • Security
      • Licensing
      • AppSource
      • Azure Marketplace
      • Events
      • Research
    • View Sitemap
    Sign in

    Developer Community
    Get help from our community supported forum
    • Home /
    • Visual Studio /
    Searched and didn’t find your feedback?
    • Visual Studio
    • Visual Studio for Mac
    • .NET
    • C++
    • Azure DevOps
    • Azure DevOps Server (TFS)
    or
    • Visual Studio
    • Visual Studio for Mac
    • .NET
    • C++
    • Azure DevOps
    • Azure DevOps Server (TFS)
    Visual Studio
    Visual Studio for Mac
    .NET
    C++
    Azure DevOps
    Azure DevOps Server (TFS)
    3

    Merge tools in "Resolve conflicts" not shown for some files

    fixed in: visual studio 2019 version 16.7 preview 4fixed in: visual studio 2019 version 16.7visual studio 2019 version 16.5visual studiowindows 10.0

    avatar image Perez, Daniel (TIT-SG) reported Apr 22, 2020 at 03:36 PM

    Show comments 4
    This issue is read only, because it has been in Closed–Fixed state for over 90 days. It was closed for 166 days.

    Add comment

    n/a
    10 |40000 characters needed characters left characters exceeded
    avatar image Feedback Bot Apr 23, 2020 at 07:35 AM
    0
    • Share
    avatar image Feedback Bot Apr 28, 2020 at 08:46 AM
    0
    • Share
    avatar image Feedback Bot Jun 19, 2020 at 09:42 PM
    1
    • Share
    avatar image Feedback Bot Jul 15, 2020 at 06:44 AM
    0
    • Share
    thub.nodes.view.add-new-comment
    Comments are read only

    Solutions

    Microsoft Solution

    by Feedback Bot    Aug 06, 2020 at 03:22 AM
    Changed state ➜ Closed - Fixed
    avatar image
    Did this solution work for you?
    This issue has been closed for over 90 days. If we haven't resolved this issue for you, please report a new problem
    Show reactions 0 Share

    Add comment

    I have installed the fix by upgrading to the latest version of Visual Studio. The issue is still not fixed:

    10 |40000 characters needed characters left characters exceeded
    No reactions yet. Did the solution above work for you?
    thub.nodes.view.add-new-comment
    Comments are read only
    Solutions are read only
    Follow

    Related Problems

    CTest adapter does not support UTF-8 encoding
    1 Solution

    VS2019 : C# Xamarin Device Log Shows No Device
    4 Solution

    URGENT: VS 2019 Causes System Wide Mouse & Keyboard Lag
    1 Solution

    NullReferenceException in Microsoft.VisualStudio.LanguageServer.Client.RemoteLanguageClientInstance
    1 Solution

    Slow Intellisence and Running Low Priority Background Processes on typing
    1 Solution

    c++ remote linux develop. Current project architecture 'ARM64' is incompatible with the remote system architecture 'x64' ('x64').
    1 Solution

    XAML designer fails and displays a conversion error when a property of the CultureInfo type is defined (.NET Core)
    1 Solution

    Referring to parameter names with \p (needed for doxygen) doesn't show up in IntelliSense.
    1 Solution

    Options->Xamarin->Apple Accounts ! Please wait until the local provisioning service is initialized
    2 Solution

    Comply HTML living standard more.
    1 Solution

    What's new
    • Surface Duo
    • Surface Laptop Go
    • Surface Pro X
    • Surface Go 2
    • Surface Book 3
    • Microsoft 365
    • Windows 10 apps
    Microsoft Store
    • Account profile
    • Download Center
    • Microsoft Store support
    • Returns
    • Order tracking
    • Virtual workshops and training
    • Microsoft Store Promise
    Education
    • Microsoft in education
    • Office for students
    • Office 365 for schools
    • Deals for students & parents
    • Microsoft Azure in education
    Enterprise
    • Azure
    • AppSource
    • Automotive
    • Government
    • Healthcare
    • Manufacturing
    • Financial services
    • Retail
    Developer
    • Microsoft Visual Studio
    • Windows Dev Center
    • Developer Center
    • Microsoft developer program
    • Channel 9
    • Office Dev Center
    • Microsoft Garage
    Company
    • Careers
    • About Microsoft
    • Company news
    • Privacy at Microsoft
    • Investors
    • Diversity and inclusion
    • Accessibility
    • Security
    English (United States)
    • Sitemap
    • Contact Microsoft
    • Privacy
    • Manage cookies
    • Terms of use
    • Trademarks
    • Safety & eco
    • About our ads
    • © Microsoft 2020
    • Anonymous
    • Sign in
    • Spaces
    • Visual Studio
    • Visual Studio for Mac
    • .NET
    • C++
    • Azure DevOps
    • Azure DevOps Server (TFS)
    • Explore
    • Topics
    • Problems
    • Features
    • Users
    • Badges