Uploaded image for project: 'Realtime Collaborative Plain WikiText Editor'
  1. Realtime Collaborative Plain WikiText Editor
  2. RTWIKI-42

in the event of a merge conflict, present a modal dialog

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: 1.14
    • Fix Version/s: 1.14
    • Labels:
      None
    • Similar issues:

      Description

      provide options for choosing one of the conflicting versions over the other.

      Only users who have made changes should see the dialog or have the option of settling the conflict

        Attachments

          Activity

            People

            • Assignee:
              amacsween Aaron MacSween
              Reporter:
              amacsween Aaron MacSween
            • Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: