Uploaded image for project: 'Sourcetree For Mac'
  1. Sourcetree For Mac
  2. SRCTREE-7266

External Merge Tool does not launch

    XMLWordPrintable

Details

    • Bug
    • Resolution: Unresolved
    • Low
    • None
    • 4.0
    • GitHub
    • None
    • Severity 1 - Critical

    Description

      Cannot resolve merge conflicts in this version!  (Version 4.0.1 (234))

      When I have a merge conflict, I choose Launch External Merge Tool.  The tool DOES NOT launch, but the system reacts as if I launched the merge tool and saved without resolving the conflicts.  My file with the conflicts is now in "pending" instead of in "conflicts", but the conflicts are still there, and Launch External Merge Tool is now grayed out when I try to select it for the file.

      Attachments

        Activity

          People

            Unassigned Unassigned
            d8a0306e9541 Tricia Rudloff
            Votes:
            0 Vote for this issue
            Watchers:
            1 Start watching this issue

            Dates

              Created:
              Updated: