External Merge Tool Not Saving Changes

XMLWordPrintable

    • Type: Bug
    • Resolution: Fixed
    • Priority: Low
    • None
    • Affects Version/s: 2.1.2.5
    • Component/s: None
    • Environment:

      SourceTree connected to a Stash Repo

       

    • Severity 2 - Major

      1. Have conflicts
      2. Right Click > Resolve Conflicts > Launch External Merge Tool
      3. Kdiff3 launches
        1. Creates 4 "extra" files
          1. _BACKUP
          2. _BASE
          3. _LOCAL
          4. _REMOTE
      4. Resolve conflicts
      5. Save in Kdiff3
      6. Close Kdiff3
      7. "Extra" files are gone
      8. File still shows as "Conflicted" and my changes that were made in Kdiff3 are no longer there

       

      Not really sure what is going on, it's like SourceTree and KDiff3 aren't communicating correctly, or maybe KDiff3 isn't saving the file in the correct location? 

      Any thoughts or direction would be great

            Assignee:
            Mukesh Kumar (Inactive)
            Reporter:
            Joshua Swanson
            Votes:
            5 Vote for this issue
            Watchers:
            9 Start watching this issue

              Created:
              Updated:
              Resolved: