Merge Conflict removes file and leaves *.orig file

XMLWordPrintable

    • Type: Bug
    • Resolution: Not a bug
    • Priority: Medium
    • None
    • Affects Version/s: None
    • Component/s: None
    • None

      Merged Branch with conflicts.
      I tried to resolve the conflict with the external Diff Viewer (TortoiseMerge)
      Then I closed the merge tool without saving.

      Now the original conflicted file is gone and i have a new *.orig file.

      I have to reset all and merge again, to get the conflicted file back!

            Assignee:
            Steve Streeting (Inactive)
            Reporter:
            Bernhard Danecker
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

              Created:
              Updated:
              Resolved: