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

Quitting external merge tool without saving marks the file as resolved

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Unresolved
    • Icon: Low Low
    • None
    • 2.0.13-beta-1
    • None
    • None
    • Severity 2 - Major

      This doesn't happen in SourceTree Mac - the file remains unresolved. I guess SourceTree is detecting the merge markers are still there. 

      It's easy to work around using "Mark Unresolved", but I'm setting severity to Major because if you don't notice what's happened, it's easy to commit a conflicted file by accident.

              Unassigned Unassigned
              5171194c0e80 molip
              Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

                Created:
                Updated: