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

Merge tool does not launch

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Fixed
    • Icon: Highest Highest
    • 3.4.10
    • 3.1.3
    • None
    • None
    • Windows 10: 1803

      Git: 2.22.0.windows.1

      Helix P4Merge: P4Merge/NTX64/2019.1/1815056

    • Severity 1 - Critical

      Sourcetree lists P4Merge as a merge tool available to use (under Options -> Diff).

       

      However, after setting the merge tool to P4Merge, and then setting the merge command to the filepath for P4Merge.exe, I am still unable to resolve conflicts by using Context Menu -> Resolve Conflicts -> Launch External Merge Tool.  

      The "Visual merge in progress" dialog opens for a moment, and the *Base, *Local *Remote etc. files are created for a moment, but then the dialog closes and the files disappear.   P4Merge never opens.

       

      When setting the Merge Command for P4Merge under Options -> Diff, I've tried using both the full filepath of P4Merge.exe without double quotes and the full filepath of P4Merge.exe with double quotes, and neither work.

              698877135425 Mukesh Kumar (Inactive)
              e58ddf5899e0 cowlinator
              Votes:
              2 Vote for this issue
              Watchers:
              4 Start watching this issue

                Created:
                Updated:
                Resolved:

                  Estimated:
                  Original Estimate - 1h
                  1h
                  Remaining:
                  Remaining Estimate - 1h
                  1h
                  Logged:
                  Time Spent - Not Specified
                  Not Specified