Unable to resolve merge conflict if local flie was deleted

XMLWordPrintable

    • Type: Bug
    • Resolution: Duplicate
    • Priority: Low
    • None
    • Affects Version/s: 1.9.6.1
    • Component/s: None
    • Environment:

      Win 10 x64 Enterprise

    • Severity 2 - Major

      Unable to resolve merge conflict if local file was deleted.
      Resolve using mine fails.
      Launch external merge tool fails (araxis\winmerge).

            Assignee:
            Unassigned
            Reporter:
            R Bea
            Votes:
            1 Vote for this issue
            Watchers:
            3 Start watching this issue

              Created:
              Updated:
              Resolved: