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)
    94

    Resolve Conflict "Source" and "Target" is confusing

    fixed in: visual studio 2019 version 16.7 preview 2visual studio 2019 version 16.0 previewwindows 10.0gituxgit-uxtop git suggestions

    avatar image Jonathan Ou-yang reported Mar 20, 2019 at 06:20 AM

    Show comments 51

    Add comment

    n/a
    10 |40000 characters needed characters left characters exceeded
    avatar image Feedback Bot Mar 20, 2019 at 08:12 AM
    0
    • Share
    avatar image Jane Wu [MSFT] Mar 22, 2019 at 02:00 AM
    -1
    • Share
    avatar image Jane Wu [MSFT] Mar 22, 2019 at 02:01 AM
    1
    • Share
    avatar image keenan.forbes Mar 27, 2019 at 04:03 PM
    15
    • Share
    avatar image Vinny Apr 18, 2019 at 03:59 PM
    19
    • Share
    avatar image Nekko Rivera Apr 18, 2019 at 04:01 PM
    8
    • Share
    avatar image Robert Heffernan Aug 29, 2019 at 11:19 PM
    9
    • Share
    avatar image Oliver Baylis Sep 27, 2019 at 11:03 AM
    4
    • Share
    avatar image Taysser Gherfal [MSFT] Dec 27, 2019 at 11:26 PM
    2
    • Share
    avatar image Caroline Penn Jan 08, 2020 at 10:50 AM
    1
    • Share
    avatar image Ivan Salo Jan 16, 2020 at 04:33 PM
    6
    • Share
    avatar image Matt Yaeger Feb 28, 2020 at 08:19 PM
    2
    • Share
    avatar image Shimmy Weitzhandler Apr 29, 2020 at 05:44 AM
    1
    • Share
    avatar image Yann Duran Apr 29, 2020 at 07:52 AM
    0
    • Share
    avatar image AndrewC Apr 29, 2020 at 04:40 PM
    2
    • Share
    avatar image Robler May 06, 2020 at 03:13 PM
    1
    • Share
    avatar image Yann Duran May 07, 2020 at 12:46 AM
    1
    • Share
    avatar image Lior Banai May 07, 2020 at 05:46 AM
    1
    • Share
    avatar image Yann Duran May 07, 2020 at 09:04 AM
    0
    • Share
    avatar image Lior Banai May 07, 2020 at 09:13 AM
    132141-merge.jpg (99.0 kB)
    3
    • Share
    avatar image Shimmy Weitzhandler May 12, 2020 at 10:43 PM
    2k8hdll.png (87.4 kB)
    2
    • Share
    avatar image Pratik Nadagouda [MSFT] May 19, 2020 at 04:15 PM
    -2
    • Share
    avatar image Karl.Dirck May 19, 2020 at 04:22 PM
    0
    • Share
    avatar image Shimmy Weitzhandler May 19, 2020 at 04:55 PM
    2
    • Share
    avatar image Matt Yaeger May 19, 2020 at 05:02 PM
    4
    • Share
    avatar image Samir Banjanovic May 19, 2020 at 05:07 PM
    4
    • Share
    avatar image David Lowndes May 19, 2020 at 05:18 PM
    4
    • Share
    avatar image Shimmy Weitzhandler May 19, 2020 at 05:21 PM
    3
    • Share
    avatar image Karl.Dirck May 19, 2020 at 05:25 PM
    1
    • Share
    avatar image Jack Tilford [MSFT] May 19, 2020 at 09:46 PM
    menu.png (18.9 kB)
    merge.png (13.3 kB)
    1
    • Share
    avatar image Shimmy Weitzhandler May 19, 2020 at 10:01 PM
    1
    • Share
    avatar image David Lowndes May 19, 2020 at 11:06 PM
    0
    • Share
    avatar image Yann Duran May 20, 2020 at 05:16 AM
    1
    • Share
    avatar image Jack Tilford [MSFT] May 20, 2020 at 03:23 PM
    2
    • Share
    avatar image David Lowndes May 20, 2020 at 03:30 PM
    0
    • Share
    avatar image Karl.Dirck May 20, 2020 at 03:39 PM
    1
    • Share
    avatar image Jack Tilford [MSFT] May 20, 2020 at 04:04 PM
    0
    • Share
    avatar image Alejandro Barreto May 20, 2020 at 04:05 PM
    0
    • Share
    avatar image Jack Tilford [MSFT] May 20, 2020 at 05:29 PM
    1
    • Share
    avatar image Samir Banjanovic May 21, 2020 at 02:04 PM
    0
    • Share
    avatar image Jack Tilford [MSFT] May 21, 2020 at 02:18 PM
    0
    • Share
    avatar image Pratik Nadagouda [MSFT] Jun 04, 2020 at 03:46 PM
    1
    • Share
    avatar image Shimmy Weitzhandler Jun 04, 2020 at 04:10 PM
    1
    • Share
    avatar image Tsahi Asher (Y) Jun 07, 2020 at 06:43 AM
    0
    • Share
    avatar image Noah Sherwin Jun 08, 2020 at 03:01 AM
    0
    • Share
    avatar image Shimmy Weitzhandler Jun 14, 2020 at 02:24 AM
    2
    • Share
    avatar image Nicolas KRIER Jun 16, 2020 at 08:42 AM
    4
    • Share
    avatar image Pratik Nadagouda [MSFT] Jun 16, 2020 at 04:37 PM
    2
    • Share
    avatar image Shimmy Weitzhandler Jun 16, 2020 at 08:30 PM
    1
    • Share
    avatar image Brian Webb Aug 14, 2020 at 08:38 AM
    0
    • Share
    avatar image Jonas Nord Oct 14, 2020 at 08:20 AM
    0
    • Share
    thub.nodes.view.add-new-comment
    Add comment
    Follow

    Related Ideas

    Full Git submodule support

    Default in a branch name when creating from Work Item

    How do I view the history of all branches in GIT?

    renaming a file does not perform a git rename

    The Send Feedback Icon cant be removed

    Invitation in commit destription box is distracting on dark theme

    cl.exe compiler driver cannot handle long file paths

    Create a pull request in Visual Studio with new Git UX

    Slow Resolve conflicts operation when too many items.

    Git Repository tab: Double click on a branch to checkout

    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