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

Merge tool not opening - solution inside comments

    XMLWordPrintable

Details

    • Bug
    • Resolution: Fixed
    • High
    • 3.4.6-beta
    • 1.9.6, 2.0.20.1
    • Git
    • windows 10 x64
      tortoise git (latest)
      sourcetree (1.9.6.1)

      did some exp. with tortoise svn (uninstalled) and having also git for windows (latest)...

    • Severity 1 - Critical

    Description

      When I have conflicts and try to launch merge tool, nothing happens.
      I've tried (use) embedded git, but have tried also system git.
      Have TortoiseGit (TortoiseGitMerge) installed and it's available in the cmd (PATH value is set).

      The only way to get some result is setting system default, but that's not a solution, since the path i need to do merge has spaces and it seems that system default uses arguments in the old tortoisemerge format (from the product tortoisesvn).

      Anyhow, not being able to run merge, not getting any errors, nor reasonable error messages is considered as a bug. Since merging is a critical feature, issue is typed as blocker.

      Important: inside process explorer under sh.exe sometimes i got a message: error opening process

      but most of the time i just see the command that's causing the freezing of the app:

      Attachments

        1. .gitconfig
          0.5 kB
        2. Capture.PNG
          Capture.PNG
          41 kB
        3. screenshot-1.png
          screenshot-1.png
          15 kB
        4. screenshot-2.png
          screenshot-2.png
          23 kB
        5. screenshot-3.png
          screenshot-3.png
          24 kB
        6. screenshot-4.png
          screenshot-4.png
          33 kB

        Issue Links

          Activity

            People

              Unassigned Unassigned
              710625f54207 balazsh
              Votes:
              4 Vote for this issue
              Watchers:
              5 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: