Uploaded image for project: 'Sourcetree for Windows'
  1. Sourcetree for Windows
  2. SRCTREEWIN-8658

Unable to Use Beyond Compare for Merge Conflict

    XMLWordPrintable

Details

    • Bug
    • Resolution: Resolved Locally
    • Low
    • None
    • 2.5.5
    • Git
    • Windows 10 Standard SourceTree Installation

    • Severity 3 - Minor

    Description

      Hi.

       

      I have contacted you about this bug before.  I received a response but am unable to find it.  the suggested fix was a complete reinstall of SourceTree, including deleting all saved settings from my User folder.  I did this but the issue remains.

      I have attached two screenshots that show the problem.  In the first, you can see that I have a file with a merge conflict.  The second shows a right-click, which has the option greyed-out.  In my settings, I have Beyond Compare configured as the external comparison tool, and this did work fine but now appears to have stopped.

      Can you offer any suggestions how I can get this re-enabled?

       

      Kind wishes ~ Patrick 

       

       

       

       

       

       

       

       

       

      Attachments

        Activity

          People

            Unassigned Unassigned
            82e381bf-5288-4729-998f-10d98bfa4e5f Deleted Account (Inactive)
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: