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

merge Conflicts considered as "Resolved" even if I pressed "Abort" in the "visual merge in progress" dialog

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Won't Fix
    • Icon: High High
    • None
    • 3.4.13
    • Git, UX
    • None
    • Severity 2 - Major

      if I try to resolve the conflicts by using "Launch External Merge Tool"

      And then I change my mind and I decide I prefer to solve the conflicts some other way, so I press "Abort" here:

       The file should remain in its current state and nothing should happen to the repository.

      Instead, even If I already pressed "Abort", the very same moment I close the external tool the file gets staged and conflicts get considered as resolved, even if I didn't do anything to solve them.

       

       

       

       

              698877135425 Mukesh Kumar (Inactive)
              7209c6aeba61 carlo sirna
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

                Created:
                Updated:
                Resolved: