r4 - 12 Jul 2007 - 10:43:06 - MimiYinYou are here: OSAF >  Journal Web  >  MimiYinNotes > ConflictResolution

When do conflicts happen?

  • Conflicts happen when 2 or more users edit the same attribute on the same version of an item
  • This can happen both through sharing and edit/updates via email

What pieces of information does an user need to be able to resolve conflicts effectively?

  • Visual feedback in the summary table that an item has conflict(s)
  • Visual feedback in the detail view than an item has conflict(s)
  • Nice to have: Local, in-place visual feedback of which attributes have conflicts
  • Nice to have: Visual feedback in the calendar canvas?

  • Which attributes have conflicts
  • Who edited that attribute
  • When they edited the attribute

Hard problems:

  • How do we prevent everyone from resolving a conflicted item in different ways, thereby causing more conflicts?

Workflow

  1. Conflicted items are automatically placed at the top of the NOW section and marked as Unread
    • The Triage status stays the same
    • Communications status displays an error icon
    • Mousing over the communications status icon displays a tooltip with the error message
  2. User selects item to view details
  3. Detail view displays a big red error message at the top
    • Click on Resolve conflict in error message to launch pop-up to view details of conflict(s)
    • Nice-to-have: Attributes with conflicts are highlighted in red
    • Nice-to-have: Click on error button to the right of the attribute to launch pop-up to view deetails of conflict(s)
  4. Pop-up launches with a laundry list of all conflicts
    • Nice-to-have: Auto-scrolls to the attribute the user clicked on to launch the pop-up
  5. User selects a version for each conflict
    • Versions are ordered by time
    • First version is selected by default
    • None of these is always an option, which effectively blanks at the field in question
  6. User clicks Resolve conflicts or Ignore conflicts
    • If user clicks Resolve conflicts, an Update is automatically sent to notify everyone that the conflict has been resolved
    • If user clicks Ignore conflicts, they can go back to the detail view and overwrite everyone's edits with their own
-- MimiYin - 20 Dec 2006

Conflict UI in the Notes field instead of a pop-up

Edit | WYSIWYG | Attach | Printable | Raw View | Backlinks: Web, All Webs | History: r4 < r3 < r2 < r1 | More topic actions
 
Open Source Applications Foundation
Except where otherwise noted, this site and its content are licensed by OSAF under an Creative Commons License, Attribution Only 3.0.
See list of page contributors for attributions.