Ticket #492 (assigned enhancement)

Opened 1 year ago

Last modified 1 month ago

Option to merge/customize conflicting records

Reported by: puck Assigned to: dgollub (accepted)
Priority: high Milestone: 0.39
Component: OpenSync Version: 0.33
Severity: normal Keywords:
Cc: tuju@iki.fi

Description

Currently if a conflict is detected the only option is to pick one or the other of the conflicting records (or neither). This isn't satisfactory if you've modified the record on both devices (i.e., the phone number on my cellphone, the email address on my computer).

What would be nice is to have an option of merging records, then replacing the record on both devices with the merged record. The interface would hopefully show the details from both records and then you can pick which ones to put into the new record.

This is a general GUI request.

Attachments

customized_entry.diff (6.2 kB) - added by dgollub on 10/15/07 23:23:58.
Initial patch for customizing entries as conflict resolution.

Change History

05/09/07 23:32:36 changed by dgollub

  • owner changed from abauer to dgollub.
  • status changed from new to assigned.
  • summary changed from Option to merge conflicting records to Option to merge/customize conflicting records.
  • milestone set to 0.30.

Great idea! At the moment i am working on the reimplementation of "Ignore" conflict and "Newest Entry" in 0.30. If there is enough time i will try to provide "Customized Entry". I would suggest to make the merge in the frontend. The user decide if the merge was correct. If not the user should be able to edit the entry in the UI .. thats the reason to call this "Customized Entry".

Independent of calling it "Merge"/"Customized" Conflict solving.. for the framework we only have to provide a conflict handler which takes a new xmlformat-$objtype and use it as (master mapping) solving entry.

06/04/07 17:42:52 changed by cstender

  • milestone deleted.

10/15/07 23:23:58 changed by dgollub

  • attachment customized_entry.diff added.

Initial patch for customizing entries as conflict resolution.

10/15/07 23:25:09 changed by dgollub

  • priority changed from normal to high.
  • version changed from 0.30 to 0.33.
  • milestone set to OpenSync 0.40.

Work in progess - initial attached patch completely untested.

10/21/07 12:17:37 changed by tuju

  • cc set to tuju@iki.fi.

06/12/08 19:39:45 changed by dgollub

  • milestone changed from 0.40 to 0.39.