Resolving Merge Conflict Is Not Applied to Multiple Selected Files

XMLWordPrintable

    • Type: Bug
    • Resolution: Cannot Reproduce
    • Priority: Low
    • None
    • Affects Version/s: 0.9.4
    • Component/s: None
    • None

      If there is a merge with 50 conflicting files and "accept theirs" is selected for all 50, the 50 files cannot be multi selected, right clicked and "Resolve Using Theirs".

      When doing that, what happens is that the file with the mouse cursor gets resolved correctly but the 49 other files get marked resolved yet sill have the chevrons (<<<<HEAD >>>>>======) in them, thus busting the build.

      The current workaround is to manually right click each file one by one.

            Assignee:
            Steve Streeting (Inactive)
            Reporter:
            RicardoA
            Votes:
            0 Vote for this issue
            Watchers:
            4 Start watching this issue

              Created:
              Updated:
              Resolved: