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

External merge tool not launching when merge conflict exists in a cherry pick operation

    XMLWordPrintable

Details

    • Bug
    • Resolution: Unresolved
    • Medium
    • None
    • None
    • None
    • None
    • Severity 2 - Major

    Description

      If one does a cherry pick operation and SourceTree yields an conflict then when one tries to Launch External Tool to look at the conflict Sourcetree does not launch it although the files LOCAL, REMOTE, BACKUP and BASE are created.

      This works fine in a normal merge conflict. I don't know why this should be different but it is.

      Attachments

        Activity

          People

            Unassigned Unassigned
            b5cfc1fe48db JIRA Autobot
            Votes:
            1 Vote for this issue
            Watchers:
            3 Start watching this issue

            Dates

              Created:
              Updated: