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

XMLWordPrintable

    • Type: Bug
    • Resolution: Unresolved
    • Priority: Medium
    • None
    • Affects Version/s: None
    • Component/s: None
    • None
    • Severity 2 - Major

      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.

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

                Created:
                Updated: