Resolution of conflict in Meld leads to ST hang

XMLWordPrintable

    • Type: Bug
    • Resolution: Unresolved
    • Priority: Medium
    • None
    • Affects Version/s: 2.6.3, 2.7
    • Component/s: Diff, General
    • None
    • Environment:

      macOS 10.13.3 Beta (17D34a)
      Meld 3.19.0

    • Severity 2 - Major

      1. Set your ST to use Meld as diff & merge app:

      • Diff command: /Applications/Meld.app/Contents/MacOS/Meld
      • Diff arguments: "$LOCAL" "$REMOTE"
      • Merge command: Same as Diff command
      • Merge arguments: "$LOCAL" "$BASE" "$REMOTE" --output="$MERGED"

      2. Create a conflict you want to resolve with merge

      3. Open conflicting file (Resolve conflicts –> Launch External Merge Tool

      4. Resolve conflict and using Cmd+Q close Meld

      5. ST gets stuck and needs to be force quited

              Assignee:
              Unassigned
              Reporter:
              Richard Bukovansky
              Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

                Created:
                Updated: